Release 2.0.7

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 769bfc84979b0faa8c6f259192f82712de83562a..d69c8799241929a0c76462e2588ccc602e571573 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,10 +1,24 @@
 #YACCFLAGS += -d -t
-YFLAGS += -d -t
-SUBDIRS =
+AM_YFLAGS = -d -t
+SUBDIRS = .
 
-CFLAGS += -Wall -Wpointer-arith -Wmissing-prototypes -Wmissing-declarations
+#GCC specific, should not be in distributed files
+#AM_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_builddir)/src   \
+       -I$(top_srcdir)         \
+       -I$(top_srcdir)/src     \
+       -I$(includedir)
 
 bin_PROGRAMS = @DOINSTGOB@
 noinst_PROGRAMS = @NOINSTGOB@
@@ -34,17 +48,17 @@ 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
 
-parse.h parse.c: parse.y
-       $(YACC) $(YFLAGS) $<
-       test -f y.tab.c && mv -f y.tab.c parse.c
-       test -f y.tab.h && mv -f y.tab.h parse.h
+# parse.h parse.c: parse.y
+#      $(YACC) $(YFLAGS) $<
+#      test -f y.tab.c && mv -f y.tab.c parse.c
+#      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 +66,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