gb-am_fixes.patch

   1 diff -Nru gb-0.0.17/gb/Makefile.am gb-0.0.17.new/gb/Makefile.am
   2 --- gb-0.0.17/gb/Makefile.am    Fri Dec  1 00:23:44 2000
   3 +++ gb-0.0.17.new/gb/Makefile.am        Fri Dec 29 20:39:50 2000
   4 @@ -7,7 +7,7 @@
   5  #
   6
   7  LDADD        = @GLIB_LIBS@
   8 -INCLUDES     = -I$(top_srcdir) @GLIB_CFLAGS@
   9 +INCLUDES     = -I$(top_srcdir) @GLIB_CFLAGS@ $(EXTRA_GNOME_CFLAGS)
  10
  11  lib_LTLIBRARIES = libgb.la
  12
  13 @@ -79,8 +79,6 @@
  14  GB_method_GPERF_FLAGS          := -k '1,3,5,9,10,$$' -t
  15  GB_object_GPERF_FLAGS           := -k '1-4,6,$$' -t
  16  GB_properties_GPERF_FLAGS      := -k '1-5,8-9,12,15,$$' -D -t
  17 -
  18 -CFLAGS += -g -DYYDEBUG -Wall $(EXTRA_GNOME_CFLAGS)
  19
  20  gb-constants.h: gb-constants.gba
  21         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
  22 diff -Nru gb-0.0.17/gbrun/Makefile.am gb-0.0.17.new/gbrun/Makefile.am
  23 --- gb-0.0.17/gbrun/Makefile.am Thu Nov 23 02:54:24 2000
  24 +++ gb-0.0.17.new/gbrun/Makefile.am     Fri Dec 29 20:40:01 2000
  25 @@ -5,7 +5,7 @@
  26  SUBDIRS = objects
  27
  28  LDADD        = @GLIB_LIBS@
  29 -INCLUDES     = -I$(top_srcdir) @GLIB_CFLAGS@
  30 +INCLUDES     = -I$(top_srcdir) @GLIB_CFLAGS@ $(EXTRA_GNOME_CFLAGS)
  31
  32  lib_LTLIBRARIES = libgbrun.la
  33
  34 @@ -38,8 +38,6 @@
  35  libgbrun_la_LIBADD = $(EXTRA_GNOME_LIBS) -lm @GLIB_LIBS@ \
  36         $(top_builddir)/gbrun/objects/libgbobj.la \
  37          $(top_builddir)/gbrun/objects/gba/libgba.la
  38 -
  39 -CFLAGS += -g -Wall $(EXTRA_GNOME_CFLAGS)
  40
  41  libgbrunincludedir = $(includedir)/gbrun
  42
  43 diff -Nru gb-0.0.17/gbrun/objects/Makefile.am gb-0.0.17.new/gbrun/objects/Makefile.am
  44 --- gb-0.0.17/gbrun/objects/Makefile.am Tue Dec 26 19:44:07 2000
  45 +++ gb-0.0.17.new/gbrun/objects/Makefile.am     Fri Dec 29 20:40:09 2000
  46 @@ -1,7 +1,7 @@
  47  SUBDIRS = gba
  48
  49  LDADD        = @GLIB_LIBS@
  50 -INCLUDES     = -I$(top_srcdir) @GLIB_CFLAGS@
  51 +INCLUDES     = -I$(top_srcdir) @GLIB_CFLAGS@ $(EXTRA_GNOME_CFLAGS)
  52
  53  noinst_LTLIBRARIES = libgbobj.la
  54
  55 @@ -28,7 +28,3 @@
  56  libgbobjinclude_HEADERS =      \
  57         libgbobj.h              \
  58         gbrun-form.h
  59 -
  60 -
  61 -CFLAGS += -g -Wall $(EXTRA_GNOME_CFLAGS)
  62 -
  63 diff -Nru gb-0.0.17/gbrun/objects/gba/Makefile.am gb-0.0.17.new/gbrun/objects/gba/Makefile.am
  64 --- gb-0.0.17/gbrun/objects/gba/Makefile.am     Sun Oct 29 01:33:16 2000
  65 +++ gb-0.0.17.new/gbrun/objects/gba/Makefile.am Fri Dec 29 20:40:17 2000
  66 @@ -8,7 +8,7 @@
  67  #
  68
  69  LDADD        = @GLIB_LIBS@
  70 -INCLUDES     = -I$(top_srcdir) @GLIB_CFLAGS@
  71 +INCLUDES     = -I$(top_srcdir) @GLIB_CFLAGS@ $(EXTRA_GNOME_CFLAGS)
  72
  73  noinst_LTLIBRARIES = libgba.la
  74
  75 @@ -30,9 +30,3 @@
  76         gba-func.c              \
  77          gba-func.h
  78  # gba-func.[ch] should be removed when all restruct. is done.
  79 -
  80 -
  81 -CFLAGS += -g -Wall $(EXTRA_GNOME_CFLAGS)
  82 -
  83 -
  84 -