1 --- gb-0.0.20/gb/Makefile.am~ Mon Sep 10 04:21:45 2001
2 +++ gb-0.0.20/gb/Makefile.am Mon Sep 10 04:24:43 2001
4 # Michael Meeks <michael@imaginator.com>
8 -INCLUDES = -I$(top_srcdir) @GLIB_CFLAGS@ $(EXTRA_GNOME_CFLAGS)
10 +INCLUDES = -I$(top_srcdir) $(GLIB_CFLAGS) $(EXTRA_GNOME_CFLAGS)
12 noinst_LTLIBRARIES = libgb.la
15 EXTRA_DIST = $(BUILT_SOURCES) gb-constants.gba $(GB_GPERF_OUTPUT) \
18 -CLEANFILES += $(BUILT_SOURCES) $(GB_GPERF_OUTPUT)
19 +CLEANFILES = $(BUILT_SOURCES) $(GB_GPERF_OUTPUT)
27 -libgb_la_LIBADD = -lm @GLIB_LIBS@ $(EXTRA_GNOME_LIBS)
28 +libgb_la_LIBADD = -lm $(GLIB_LIBS) $(EXTRA_GNOME_LIBS)
31 # -c Generates C code that uses the strncmp function to perform string
34 gperf $(GB_$*_GPERF_FLAGS) -L 'ANSI-C' -l -C -c -N $(addsuffix _lookup, $*) $^ > $@
36 -YFLAGS += -d -v -p gb_
37 +YFLAGS = -d -v -p gb_
39 libgbincludedir = $(includedir)/gb
40 libgbinclude_HEADERS = \
41 --- gb-0.0.20/gbrun/objects/gba/Makefile.am~ Wed Jun 27 16:35:42 2001
42 +++ gb-0.0.20/gbrun/objects/gba/Makefile.am Mon Sep 10 04:41:24 2001
44 # (C) HelixCode Inc, 2000
48 -INCLUDES = -I$(top_srcdir) @GLIB_CFLAGS@
50 +INCLUDES = -I$(top_srcdir) $(GLIB_CFLAGS)
52 noinst_LTLIBRARIES = libgba.la
56 # gba-func.[ch] should be removed when all restruct. is done.
59 -CFLAGS += -g -Wall $(EXTRA_GNOME_CFLAGS)
63 +libgba_la_CFLAGS = $(EXTRA_GNOME_CFLAGS)
64 --- gb-0.0.20/Makefile.am~ Mon Sep 10 04:55:37 2001
65 +++ gb-0.0.20/Makefile.am Mon Sep 10 04:55:25 2001
67 SUBDIRS = gb gbrun test docs po intl
70 - README README.CVS FAQ TODO
71 + README README.CVS FAQ TODO \
72 + gbConf.sh.in gb.spec
75 confexecdir = $(libdir)
76 confexec_DATA = gbConf.sh
78 -EXTRA_DIST = gbConf.sh.in gb.spec
79 -CLEANFILES += gbConf.sh
80 +CLEANFILES = gbConf.sh
81 gbConf.sh: gbConf.sh.in Makefile
82 sed -e 's?\@GB_LIBDIR\@?$(GB_LIBDIR)?g' \
83 -e 's?\@GB_INCLUDEDIR\@?$(GB_INCLUDEDIR)?g' \