summaryrefslogtreecommitdiff
path: root/x11/libXt/patches/patch-ab
blob: 211ef6ea9aee090775f11fec8ec9f55466681689 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
$NetBSD: patch-ab,v 1.5 2009/07/18 10:28:47 wiz Exp $

--- util/Makefile.in.orig	2009-07-02 17:25:58.000000000 +0000
+++ util/Makefile.in
@@ -34,7 +34,9 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 @INSTALL_MAKESTRS_TRUE@bin_PROGRAMS = makestrs$(EXEEXT)
-@INSTALL_MAKESTRS_FALSE@noinst_PROGRAMS = makestrs$(EXEEXT)
+@INSTALL_MAKESTRS_FALSE@noinst_PROGRAMS = makestrs$(EXEEXT) \
+@INSTALL_MAKESTRS_FALSE@	$(am__EXEEXT_1)
+@INSTALL_MAKESTRS_TRUE@noinst_PROGRAMS = $(am__EXEEXT_1)
 subdir = util
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -47,10 +49,14 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+@CROSS_COMPILING_TRUE@am__EXEEXT_1 = xmakestrs$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
 am_makestrs_OBJECTS = makestrs-makestrs.$(OBJEXT)
 makestrs_OBJECTS = $(am_makestrs_OBJECTS)
 makestrs_LDADD = $(LDADD)
+xmakestrs_SOURCES = xmakestrs.c
+xmakestrs_OBJECTS = xmakestrs.$(OBJEXT)
+xmakestrs_LDADD = $(LDADD)
 makestrs_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(makestrs_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
@@ -66,8 +72,8 @@ CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
-SOURCES = $(makestrs_SOURCES)
-DIST_SOURCES = $(makestrs_SOURCES)
+SOURCES = $(makestrs_SOURCES) xmakestrs.c
+DIST_SOURCES = $(makestrs_SOURCES) xmakestrs.c
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -101,6 +107,8 @@ CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@
+CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
@@ -220,6 +228,7 @@ top_srcdir = @top_srcdir@
 EXTRA_DIST = Shell.ht StrDefs.ct StrDefs.ht string.list $(appman_PRE)
 makestrs_CFLAGS = $(XT_CFLAGS)
 makestrs_SOURCES = makestrs.c
+@CROSS_COMPILING_TRUE@MAKESTRS_PROG = xmakestrs$(EXEEXT)
 
 # Man page
 appmandir = $(APP_MAN_DIR)
@@ -303,6 +312,9 @@ clean-noinstPROGRAMS:
 	  echo " rm -f $$p $$f"; \
 	  rm -f $$p $$f ; \
 	done
+@CROSS_COMPILING_FALSE@xmakestrs$(EXEEXT): $(xmakestrs_OBJECTS) $(xmakestrs_DEPENDENCIES) 
+@CROSS_COMPILING_FALSE@	@rm -f xmakestrs$(EXEEXT)
+@CROSS_COMPILING_FALSE@	$(LINK) $(xmakestrs_LDFLAGS) $(xmakestrs_OBJECTS) $(xmakestrs_LDADD) $(LIBS)
 makestrs$(EXEEXT): $(makestrs_OBJECTS) $(makestrs_DEPENDENCIES) 
 	@rm -f makestrs$(EXEEXT)
 	$(makestrs_LINK) $(makestrs_OBJECTS) $(makestrs_LDADD) $(LIBS)
@@ -314,6 +326,7 @@ distclean-compile:
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/makestrs-makestrs.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmakestrs.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -555,6 +568,10 @@ uninstall-am: uninstall-appmanDATA unins
 	uninstall-appmanDATA uninstall-binPROGRAMS
 
 
+@CROSS_COMPILING_TRUE@xmakestrs$(EXEEXT): makestrs.c
+@CROSS_COMPILING_TRUE@	$(CC_FOR_BUILD) $(X11_CFLAGS) $(CPPFLAGS_FOR_BUILD) \
+@CROSS_COMPILING_TRUE@	    $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ makestrs.c
+
 .man.$(APP_MAN_SUFFIX):
 	sed $(MAN_SUBSTS) < $< > $@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.