X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/e10d6e307623d0952f6e1f5d9fee8720ddab4808..69c350c69e70bddb040dfc5d90b0368376a6389e:/src/Makefile.in

diff --git a/src/Makefile.in b/src/Makefile.in
index 6dddce3..147104d 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -60,12 +60,10 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 CC = @CC@
-CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 DOINSTGOB = @DOINSTGOB@
 GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_CONFIG = @GLIB_CONFIG@
 GLIB_LIBS = @GLIB_LIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -74,45 +72,51 @@ MAKEINFO = @MAKEINFO@
 MV = @MV@
 NOINSTGOB = @NOINSTGOB@
 PACKAGE = @PACKAGE@
+PKG_CONFIG = @PKG_CONFIG@
 RM = @RM@
 TAR = @TAR@
 VERSION = @VERSION@
 YACC = @YACC@
 
-YFLAGS =  -d -t
-SUBDIRS = 
+YFLAGS = -d -t
+SUBDIRS = .
+
+CFLAGS = @CFLAGS@ 	-Wall				-Wpointer-arith			-Wmissing-prototypes		-Wmissing-declarations
+
+
+DEFS = @DEFS@ 	-DPKGDATADIR=\"$(pkgdatadir)\"
+
+
+INCLUDES =  	$(GLIB_CFLAGS)			-I$(top_builddir)		-I$(top_builddir)/src		-I$(top_srcdir)			-I$(top_srcdir)/src		-I$(includedir)
 
-INCLUDES = @GLIB_CFLAGS@ -I$(includedir)
 
 bin_PROGRAMS = @DOINSTGOB@
 noinst_PROGRAMS = @NOINSTGOB@
-EXTRA_PROGRAMS = gob
+EXTRA_PROGRAMS = gob2
 
-gob_SOURCES =  	main.c			main.h			tree.c			tree.h			out.c			out.h			util.c			util.h			checks.c		checks.h		parse.y			lexer.l
+BUILT_SOURCES = parse.h parse.c lexer.c
+
+gob2_SOURCES =  	main.c			main.h			treefuncs.c		treefuncs.h		out.c			out.h			util.c			util.h			checks.c		checks.h		parse.y			lexer.l
 
 
-gob_LDADD =  	-lm 	$(GLIB_LIBS) 	@LEXLIB@
+gob2_LDADD =  	-lm 	$(GLIB_LIBS) 	@LEXLIB@
 
 
 # we might want popt back in the future
 #	@POPT_LIB@
 
-BUILT_SOURCES = parse.h parse.c lexer.c
+CLEANFILES = @CLEANFILES@ $(BUILT_SOURCES) test-object.* test-object-private.h
 
-CLEANFILES =  $(BUILT_SOURCES) gtk-weird-button.* gtk-weird-button-private.h
-
-EXTRA_DIST = test.gob
+EXTRA_DIST = $(BUILT_SOURCES) test.gob generate_treefuncs.pl treefuncs.def
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
 PROGRAMS =  $(bin_PROGRAMS) $(noinst_PROGRAMS)
 
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I..
 LIBS = @LIBS@
-gob_OBJECTS =  main.o tree.o out.o util.o checks.o parse.o lexer.o
-gob_DEPENDENCIES = 
-gob_LDFLAGS = 
+gob2_OBJECTS =  main.o treefuncs.o out.o util.o checks.o parse.o lexer.o
+gob2_DEPENDENCIES = 
+gob2_LDFLAGS = 
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LEXLIB = @LEXLIB@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -124,8 +128,8 @@ DIST_COMMON =  Makefile.am Makefile.in lexer.c parse.c
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 GZIP_ENV = --best
-SOURCES = $(gob_SOURCES)
-OBJECTS = $(gob_OBJECTS)
+SOURCES = $(gob2_SOURCES)
+OBJECTS = $(gob2_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
@@ -191,9 +195,9 @@ distclean-compile:
 
 maintainer-clean-compile:
 
-gob: $(gob_OBJECTS) $(gob_DEPENDENCIES)
-	@rm -f gob
-	$(LINK) $(gob_LDFLAGS) $(gob_OBJECTS) $(gob_LDADD) $(LIBS)
+gob2: $(gob2_OBJECTS) $(gob2_DEPENDENCIES)
+	@rm -f gob2
+	$(LINK) $(gob2_LDFLAGS) $(gob2_OBJECTS) $(gob2_LDADD) $(LIBS)
 .l.c:
 	$(LEX) $(AM_LFLAGS) $(LFLAGS) $< && mv $(LEX_OUTPUT_ROOT).c $@
 .y.c:
@@ -240,7 +244,7 @@ maintainer-clean-recursive:
 	dot_seen=no; \
 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
 	  rev="$$subdir $$rev"; \
-	  test "$$subdir" = "." && dot_seen=yes; \
+	  test "$$subdir" != "." || dot_seen=yes; \
 	done; \
 	test "$$dot_seen" = "no" && rev=". $$rev"; \
 	target=`echo $@ | sed s/-recursive//`; \
@@ -301,7 +305,7 @@ distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$/$$file $(distdir)/$$file; \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@@ -318,13 +322,14 @@ distdir: $(DISTFILES)
 	      || exit 1; \
 	  fi; \
 	done
-checks.o: checks.c ../config.h tree.h main.h util.h checks.h
-lexer.o: lexer.c ../config.h parse.h main.h util.h
-main.o: main.c ../config.h tree.h parse.h out.h util.h checks.h main.h
+checks.o: checks.c ../config.h treefuncs.h main.h util.h checks.h
+lexer.o: lexer.c ../config.h treefuncs.h parse.h main.h util.h
+main.o: main.c ../config.h treefuncs.h parse.h out.h util.h checks.h \
+	main.h
 out.o: out.c main.h out.h
-parse.o: parse.c ../config.h tree.h main.h util.h
-tree.o: tree.c ../config.h tree.h
-util.o: util.c ../config.h main.h util.h
+parse.o: parse.c ../config.h treefuncs.h main.h util.h
+treefuncs.o: treefuncs.c treefuncs.h
+util.o: util.c ../config.h treefuncs.h main.h util.h
 
 info-am:
 info: info-recursive
@@ -410,24 +415,24 @@ installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
-parse.h: parse.y
+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
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.