Add new auto-detection of thread flags.

[postgresql] / src / interfaces / ecpg / preproc / Makefile

diff --git a/src/interfaces/ecpg/preproc/Makefile b/src/interfaces/ecpg/preproc/Makefile
index 1873d13ce978405d2811247bc9833cb8c4d6f20d..52fa7f79a6d2a09c72114d8db329b102256d2582 100644 (file)
--- a/src/interfaces/ecpg/preproc/Makefile
+++ b/src/interfaces/ecpg/preproc/Makefile
@@ -1,50 +1,76 @@
-SRCDIR= ../../..
-include $(SRCDIR)/Makefile.global
+# $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/Makefile,v 1.100 2004/04/23 18:15:55 momjian Exp $
 
-MAJOR_VERSION=2
-MINOR_VERSION=6
-PATCHLEVEL=12
+subdir = src/interfaces/ecpg/preproc
+top_builddir = ../../../..
+include $(top_builddir)/src/Makefile.global
 
-CFLAGS+=-I../include -DMAJOR_VERSION=$(MAJOR_VERSION) \
+MAJOR_VERSION=3
+MINOR_VERSION=2
+PATCHLEVEL=0
+
+override CPPFLAGS := -I$(srcdir)/../include -I$(srcdir) $(CPPFLAGS) $(PTHREAD_CFLAGS) \
+       -DMAJOR_VERSION=$(MAJOR_VERSION) \
        -DMINOR_VERSION=$(MINOR_VERSION) -DPATCHLEVEL=$(PATCHLEVEL) \
-       -DINCLUDE_PATH=\"$(HEADERDIR)\" -g
+       -DINCLUDEDIR=\"$(includedir)\" \
+       -DPKGINCLUDEDIR=\"$(pkgincludedir)\" 
+
+ifeq ($(GCC), yes)
+override CFLAGS += -Wno-error
+endif
+
+OBJS=preproc.o type.o ecpg.o ecpg_keywords.o output.o\
+    keywords.o c_keywords.o ../ecpglib/typename.o descriptor.o variable.o
+
+
+all: submake-libpgport ecpg
+
+ecpg: $(OBJS)
+       $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LIBS) $(PTHREAD_LIBS) -o $@
+
+# pgc is compiled as part of preproc
+preproc.o: $(srcdir)/pgc.c
+
+$(srcdir)/preproc.c: $(srcdir)/preproc.h ;
 
-OBJ=preproc.o pgc.o type.o ecpg.o ecpg_keywords.o \
-    keywords.o c_keywords.o ../lib/typename.o
-#../../../backend/parser/scansup.o
+$(srcdir)/preproc.h: preproc.y
+ifdef YACC
+       $(YACC) -d $(YFLAGS) $<
+       mv -f y.tab.c $(srcdir)/preproc.c
+       mv -f y.tab.h $(srcdir)/preproc.h
+else
+       @$(missing) bison $< $@
+endif
 
-all:: ecpg
+$(srcdir)/pgc.c: pgc.l
+ifdef FLEX
+       $(FLEX) $(FLEXFLAGS) -o'$@' $<
+else
+       @$(missing) flex $< $@
+endif
 
-# Rule that really do something.
-ecpg: $(OBJ)
-       $(CC) -o ecpg $(OBJ) $(LEXLIB) $(LDFLAGS)
+c_keywords.o ecpg_keywords.o keywords.o preproc.o: preproc.h
 
-preproc.c preproc.h: preproc.y
-       $(YACC) $(YFLAGS) $<
-       mv y.tab.c preproc.c
-       mv y.tab.h preproc.h
 
-pgc.c: pgc.l
-       $(LEX) $<
-       mv lex.yy.c pgc.c
+distprep: $(srcdir)/preproc.c $(srcdir)/preproc.h $(srcdir)/pgc.c
 
-clean:
-       rm -f *.o core a.out ecpg$(X) *~ *.output
-# And the garbage that might have been left behind by partial build:
-       rm -f y.tab.c y.tab.h lex.yy.c
-# make clean does not remove preproc.c, preproc.h, pgc.c since we want
-# to ship those files in the distribution, for people with inadequate tools.
+install: all installdirs
+       $(INSTALL_PROGRAM) ecpg$(X) $(DESTDIR)$(bindir)
 
-install: all
-       $(INSTALL) $(INSTL_EXE_OPTS) ecpg$(X) $(BINDIR)
+installdirs:
+       $(mkinstalldirs) $(DESTDIR)$(bindir)
 
 uninstall:
-       rm -f $(BINDIR)/ecpg
+       rm -f $(DESTDIR)$(bindir)/ecpg$(X)
 
-preproc.o: preproc.h ../include/ecpgtype.h keywords.c c_keywords.c ecpg_keywords.c
-type.o: ../include/ecpgtype.h
-pgc.o: ../include/ecpgtype.h keywords.c c_keywords.c ecpg_keywords.c preproc.h
-keywords.o: ../include/ecpgtype.h preproc.h
-c_keywords.o: ../include/ecpgtype.h preproc.h 
-ecpg_keywords.o: ../include/ecpgtype.h preproc.h 
+clean distclean:
+       rm -f *.o ecpg$(X)
+# garbage from partial builds
+       @rm -f y.tab.c y.tab.h
+# garbage from development
+       @rm -f core a.out *~ *.output *.tab.c
 
+# `make clean' does not remove preproc.c, preproc.h, or pgc.c since we
+# want to ship those files in the distribution for people with
+# inadequate tools.
+maintainer-clean: distclean
+       rm -f $(srcdir)/preproc.c $(srcdir)/preproc.h $(srcdir)/pgc.c