Release 2.0.0

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

diff --git a/src/Makefile.am b/src/Makefile.am
index ffe911378269005857be807b0df195847d567a77..b9d186dd6178f9757034fa61883f4c18b0f9185b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,18 +1,31 @@
 #YACCFLAGS += -d -t
-YFLAGS += -d -t
-SUBDIRS =
+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_builddir)/src   \
+       -I$(top_srcdir)         \
+       -I$(top_srcdir)/src     \
+       -I$(includedir)
 
 bin_PROGRAMS = @DOINSTGOB@
 noinst_PROGRAMS = @NOINSTGOB@
-EXTRA_PROGRAMS = gob
+EXTRA_PROGRAMS = gob2
 
 BUILT_SOURCES = parse.h parse.c lexer.c
 
-gob_SOURCES =  \
+gob2_SOURCES =         \
        main.c          \
        main.h          \
        treefuncs.c     \
@@ -26,7 +39,7 @@ gob_SOURCES =         \
        parse.y         \
        lexer.l
 
-gob_LDADD = \
+gob2_LDADD = \
        -lm \
        $(GLIB_LIBS) \
        @LEXLIB@
@@ -34,25 +47,25 @@ gob_LDADD = \
 # we might want popt back in the future
 #      @POPT_LIB@
 
-CLEANFILES += $(BUILT_SOURCES) gtk-weird-button.* gtk-weird-button-private.h
+CLEANFILES = @CLEANFILES@ $(BUILT_SOURCES) test-object.* test-object-private.h
 
-EXTRA_DIST = test.gob generate_treefuncs.pl treefuncs.def
+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
 
-test: gtk-weird-button.c gtk-weird-button.h
-       $(CC) -g -Wall `gtk-config --cflags` -c gtk-weird-button.c
+test: test-object.c test-object.h
+       $(CC) -g -Wall `pkg-config --cflags gobject-2.0 gtk+-2.0` -c test-object.c
 
-gtk-weird-button.c gtk-weird-button.h: test.gob gob
-       ./gob test.gob
+test-object.c test-object.h: test.gob gob2
+       ./gob2 test.gob
 
 # can't depend on the header file as that would break the above rule
 # since it's just for testing, who cares
-testcpp: gtk-weird-button.cc
-       g++ -g -Wall `gtk-config --cflags` -c gtk-weird-button.cc
+testcpp: test-object.cc
+       g++ -g -Wall `pkg-config --cflags gobject-2.0 gtk+-2.0` -c test-object.cc
 
-gtk-weird-button.cc: test.gob gob
-       ./gob --for-cpp test.gob
+test-object.cc: test.gob gob2
+       ./gob2 --for-cpp test.gob