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 --- gb-0.0.20/gbrun/Makefile.am.orig    Thu May  3 02:48:18 2001
  23 +++ gb-0.0.20/gbrun/Makefile.am Tue Aug 28 07:40:38 2001
  24 @@ -4,8 +4,8 @@
  25
  26  SUBDIRS = objects
  27
  28 -LDADD        = @GLIB_LIBS@
  29 -INCLUDES     = -I$(top_srcdir) @GLIB_CFLAGS@
  30 +LDADD        = $(GLIB_LIBS)
  31 +INCLUDES     = -I$(top_srcdir) $(GLIB_CFLAGS) $(EXTRA_GNOME_CFLAGS)
  32
  33  lib_LTLIBRARIES = libgbrun.la
  34
  35 @@ -35,13 +35,11 @@
  36         gbrun-value.c           \
  37         libgbrun.h
  38
  39 -libgbrun_la_LIBADD = $(EXTRA_GNOME_LIBS) -lm @GLIB_LIBS@ \
  40 +libgbrun_la_LIBADD = $(EXTRA_GNOME_LIBS) -lm $(GLIB_LIBS) \
  41         $(top_builddir)/gbrun/objects/libgbobj.la \
  42          $(top_builddir)/gbrun/objects/gba/libgba.la \
  43          $(top_builddir)/gb/libgb.la
  44
  45 -CFLAGS += -g -Wall $(EXTRA_GNOME_CFLAGS)
  46 -
  47  libgbrunincludedir = $(includedir)/gbrun
  48
  49  libgbruninclude_HEADERS =      \
  50 @@ -54,4 +52,3 @@
  51         gbrun-global.h          \
  52         gbrun-value.h           \
  53         gbrun-project.h
  54 -
  55 --- gb-0.0.20/gbrun/objects/Makefile.am.orig    Thu May  3 02:42:40 2001
  56 +++ gb-0.0.20/gbrun/objects/Makefile.am Tue Aug 28 07:36:22 2001
  57 @@ -1,7 +1,7 @@
  58  SUBDIRS = gba
  59
  60 -LDADD        = @GLIB_LIBS@
  61 -INCLUDES     = -I$(top_srcdir) @GLIB_CFLAGS@
  62 +LDADD        = $(GLIB_LIBS)
  63 +INCLUDES     = -I$(top_srcdir) $(GLIB_CFLAGS) $(EXTRA_GNOME_CFLAGS)
  64
  65  noinst_LTLIBRARIES = libgbobj.la
  66
  67 @@ -32,7 +32,3 @@
  68  libgbobjinclude_HEADERS =      \
  69         libgbobj.h              \
  70         gbrun-form.h
  71 -
  72 -
  73 -CFLAGS += -g -Wall $(EXTRA_GNOME_CFLAGS)
  74 -