Release 1.99.2

[gob-dx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 769bfc84979b0faa8c6f259192f82712de83562a..6a8b8297ba4c196a8f6ad3b47587e56cc142b038 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,10 +1,21 @@
 #YACCFLAGS += -d -t
-YFLAGS += -d -t
+YFLAGS = -d -t
 SUBDIRS =
 
-CFLAGS += -Wall -Wpointer-arith -Wmissing-prototypes -Wmissing-declarations
+CFLAGS = @CFLAGS@ \
+       -Wall                   \
+       -Wpointer-arith         \
+       -Wmissing-prototypes    \
+       -Wmissing-declarations
 
-INCLUDES = @GLIB_CFLAGS@ -I$(includedir)
+DEFS = @DEFS@ \
+       -DPKGDATADIR=\"$(pkgdatadir)\"
+
+INCLUDES = \
+       $(GLIB_CFLAGS)          \
+       -I$(top_builddir)       \
+       -I$(top_srcdir)         \
+       -I$(includedir)
 
 bin_PROGRAMS = @DOINSTGOB@
 noinst_PROGRAMS = @NOINSTGOB@
@@ -34,7 +45,7 @@ gob2_LDADD = \
 # we might want popt back in the future
 #      @POPT_LIB@
 
-CLEANFILES += $(BUILT_SOURCES) test-object.* test-object-private.h
+CLEANFILES = @CLEANFILES@ $(BUILT_SOURCES) test-object.* test-object-private.h
 
 EXTRA_DIST = $(BUILT_SOURCES) test.gob generate_treefuncs.pl treefuncs.def
 
@@ -44,7 +55,7 @@ parse.h parse.c: parse.y
        test -f y.tab.h && mv -f y.tab.h parse.h
 
 test: test-object.c test-object.h
-       $(CC) -g -Wall `pkg-config --cflags gobject-2.0` -c test-object.c
+       $(CC) -g -Wall `pkg-config --cflags gobject-2.0 gtk+-2.0` -c test-object.c
 
 test-object.c test-object.h: test.gob gob2
        ./gob2 test.gob
@@ -52,7 +63,7 @@ test-object.c test-object.h: test.gob gob2
 # can't depend on the header file as that would break the above rule
 # since it's just for testing, who cares
 testcpp: test-object.cc
-       g++ -g -Wall `pkg-config --cflags gobject-2.0` -c test-object.cc
+       g++ -g -Wall `pkg-config --cflags gobject-2.0 gtk+-2.0` -c test-object.cc
 
 test-object.cc: test.gob gob2
        ./gob2 --for-cpp test.gob