diff -Nru gb-0.0.17/gb/Makefile.am gb-0.0.17.new/gb/Makefile.am
--- gb-0.0.17/gb/Makefile.am	Fri Dec  1 00:23:44 2000
+++ gb-0.0.17.new/gb/Makefile.am	Fri Dec 29 20:39:50 2000
@@ -7,7 +7,7 @@
 # 
 
 LDADD        = @GLIB_LIBS@
-INCLUDES     = -I$(top_srcdir) @GLIB_CFLAGS@
+INCLUDES     = -I$(top_srcdir) @GLIB_CFLAGS@ $(EXTRA_GNOME_CFLAGS)
 
 lib_LTLIBRARIES = libgb.la
 
@@ -79,8 +79,6 @@
 GB_method_GPERF_FLAGS		:= -k '1,3,5,9,10,$$' -t
 GB_object_GPERF_FLAGS           := -k '1-4,6,$$' -t
 GB_properties_GPERF_FLAGS	:= -k '1-5,8-9,12,15,$$' -D -t
-
-CFLAGS += -g -DYYDEBUG -Wall $(EXTRA_GNOME_CFLAGS)
 
 gb-constants.h: gb-constants.gba
 	sed -e "s/'[02].*//" $(srcdir)/gb-constants.gba | sed -e "s/'1//" | perl -pe 's/^const[ \t]+/\#define GB_C_/;s/GB_C_gb/GB_C_/' > gb-constants.h
--- gb-0.0.20/gbrun/Makefile.am.orig	Thu May  3 02:48:18 2001
+++ gb-0.0.20/gbrun/Makefile.am	Tue Aug 28 07:40:38 2001
@@ -4,8 +4,8 @@
 
 SUBDIRS = objects
 
-LDADD        = @GLIB_LIBS@
-INCLUDES     = -I$(top_srcdir) @GLIB_CFLAGS@ 
+LDADD        = $(GLIB_LIBS)
+INCLUDES     = -I$(top_srcdir) $(GLIB_CFLAGS) $(EXTRA_GNOME_CFLAGS)
 
 lib_LTLIBRARIES = libgbrun.la
 
@@ -35,13 +35,11 @@
 	gbrun-value.c		\
 	libgbrun.h
 
-libgbrun_la_LIBADD = $(EXTRA_GNOME_LIBS) -lm @GLIB_LIBS@ \
+libgbrun_la_LIBADD = $(EXTRA_GNOME_LIBS) -lm $(GLIB_LIBS) \
 	$(top_builddir)/gbrun/objects/libgbobj.la \
         $(top_builddir)/gbrun/objects/gba/libgba.la \
         $(top_builddir)/gb/libgb.la
 
-CFLAGS += -g -Wall $(EXTRA_GNOME_CFLAGS)
-
 libgbrunincludedir = $(includedir)/gbrun
 
 libgbruninclude_HEADERS =	\
@@ -54,4 +52,3 @@
 	gbrun-global.h		\
 	gbrun-value.h		\
 	gbrun-project.h
-
--- gb-0.0.20/gbrun/objects/Makefile.am.orig	Thu May  3 02:42:40 2001
+++ gb-0.0.20/gbrun/objects/Makefile.am	Tue Aug 28 07:36:22 2001
@@ -1,7 +1,7 @@
 SUBDIRS = gba
 
-LDADD        = @GLIB_LIBS@
-INCLUDES     = -I$(top_srcdir) @GLIB_CFLAGS@ 
+LDADD        = $(GLIB_LIBS)
+INCLUDES     = -I$(top_srcdir) $(GLIB_CFLAGS) $(EXTRA_GNOME_CFLAGS)
 
 noinst_LTLIBRARIES = libgbobj.la
 
@@ -32,7 +32,3 @@
 libgbobjinclude_HEADERS =	\
 	libgbobj.h		\
 	gbrun-form.h
-
-
-CFLAGS += -g -Wall $(EXTRA_GNOME_CFLAGS)
-