Attachment #203895 for bug #263897

Lines 48-53 Link Here

(-)configure.ac.bak (+6 lines)
48	fi	48	fi
49	fi	49	fi
50	AC_SUBST([CC_FOR_BUILD])	50	AC_SUBST([CC_FOR_BUILD])
		51	CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-${CFLAGS}}
		52	AC_SUBST(CFLAGS_FOR_BUILD)
		53	LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-${LDFLAGS}}
		54	AC_SUBST(LDFLAGS_FOR_BUILD)
		55
		56	AM_CONDITIONAL(CROSS_COMPILING, [ test $cross_compiling = yes ])
51		57
52	PKG_CHECK_MODULES(XT, sm x11 xproto kbproto)	58	PKG_CHECK_MODULES(XT, sm x11 xproto kbproto)
53		59




if INSTALL_MAKESTRS
bin_PROGRAMS = makestrs
noinst_PROGRAMS = $(MAKESTRS_PROG)
else
noinst_PROGRAMS = makestrs
noinst_PROGRAMS += $(MAKESTRS_PROG)
endif

CC = @CC_FOR_BUILD@

EXTRA_DIST = \
	Shell.ht \
	StrDefs.ct \


.man.$(APP_MAN_SUFFIX):
	sed $(MAN_SUBSTS) < $< > $@

if CROSS_COMPILING
MAKESTRS_PROG=xmakestrs$(EXEEXT)

xmakestrs$(EXEEXT): makestrs.c
	$(CC_FOR_BUILD) $(X11_CFLAGS) $(CPPFLAGS_FOR_BUILD) \
	$(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ makestrs.c
endif






STRING_LIST = $(top_srcdir)/util/string.list

if CROSS_COMPILING
MAKESTRS=$(top_builddir)/util/xmakestrs
else
MAKESTRS=$(top_builddir)/util/makestrs
endif

all-local: $(BUILT_FILES)

$(BUILT_HEADER): $(BUILT_SOURCE)

$(BUILT_SOURCE):
	$(MAKESTRS) -i $(top_srcdir) $(STRINGSABIOPTIONS) < $(STRING_LIST) > StringDefs.c
	mkdir -p $(top_builddir)/src
	mkdir -p $(top_builddir)/include/X11
	cp StringDefs.h $(top_builddir)/include/X11

Return to bug 263897

Lines 92-103 Link Here

(-)src/Makefile.am.bak (-1 / +7 lines)
92		92
93	STRING_LIST = $(top_srcdir)/util/string.list	93	STRING_LIST = $(top_srcdir)/util/string.list
94		94
		95	if CROSS_COMPILING
		96	MAKESTRS=$(top_builddir)/util/xmakestrs
		97	else
		98	MAKESTRS=$(top_builddir)/util/makestrs
		99	endif
		100
95	all-local: $(BUILT_FILES)	101	all-local: $(BUILT_FILES)
96		102
97	$(BUILT_HEADER): $(BUILT_SOURCE)	103	$(BUILT_HEADER): $(BUILT_SOURCE)
98		104
99	$(BUILT_SOURCE):	105	$(BUILT_SOURCE):
100	$(top_builddir)/util/makestrs -i $(top_srcdir) $(STRINGSABIOPTIONS) < $(STRING_LIST) > StringDefs.c	106	$(MAKESTRS) -i $(top_srcdir) $(STRINGSABIOPTIONS) < $(STRING_LIST) > StringDefs.c
101	mkdir -p $(top_builddir)/src	107	mkdir -p $(top_builddir)/src
102	mkdir -p $(top_builddir)/include/X11	108	mkdir -p $(top_builddir)/include/X11
103	cp StringDefs.h $(top_builddir)/include/X11	109	cp StringDefs.h $(top_builddir)/include/X11

Lines 1-11 Link Here

(-)util/Makefile.am.bak (-2 / +11 lines)
1	if INSTALL_MAKESTRS	1	if INSTALL_MAKESTRS
2	bin_PROGRAMS = makestrs	2	bin_PROGRAMS = makestrs
		3	noinst_PROGRAMS = $(MAKESTRS_PROG)
3	else	4	else
4	noinst_PROGRAMS = makestrs	5	noinst_PROGRAMS = makestrs
		6	noinst_PROGRAMS += $(MAKESTRS_PROG)
5	endif	7	endif
6		8
7	CC = @CC_FOR_BUILD@
8
9	EXTRA_DIST = \	9	EXTRA_DIST = \
10	Shell.ht \	10	Shell.ht \
11	StrDefs.ct \	11	StrDefs.ct \
Lines 43-45 Link Here
43		43
44	.man.$(APP_MAN_SUFFIX):	44	.man.$(APP_MAN_SUFFIX):
45	sed $(MAN_SUBSTS) < $< > $@	45	sed $(MAN_SUBSTS) < $< > $@
		46
		47	if CROSS_COMPILING
		48	MAKESTRS_PROG=xmakestrs$(EXEEXT)
		49
		50	xmakestrs$(EXEEXT): makestrs.c
		51	$(CC_FOR_BUILD) $(X11_CFLAGS) $(CPPFLAGS_FOR_BUILD) \
		52	$(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ makestrs.c
		53	endif
		54