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 ecdadfe6b7bf01d1d7a5e8949a8afd304e792083..52fa7f79a6d2a09c72114d8db329b102256d2582 100644 (file)
--- a/src/interfaces/ecpg/preproc/Makefile
+++ b/src/interfaces/ecpg/preproc/Makefile
@@ -1,45 +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 $
+
+subdir = src/interfaces/ecpg/preproc
+top_builddir = ../../../..
+include $(top_builddir)/src/Makefile.global
 
 MAJOR_VERSION=3
-MINOR_VERSION=0
+MINOR_VERSION=2
 PATCHLEVEL=0
 
-CFLAGS+=-I../include -DMAJOR_VERSION=$(MAJOR_VERSION) \
+override CPPFLAGS := -I$(srcdir)/../include -I$(srcdir) $(CPPFLAGS) $(PTHREAD_CFLAGS) \
+       -DMAJOR_VERSION=$(MAJOR_VERSION) \
        -DMINOR_VERSION=$(MINOR_VERSION) -DPATCHLEVEL=$(PATCHLEVEL) \
-       -DINCLUDE_PATH=\"$(DESTDIR)$(HEADERDIR)\"
+       -DINCLUDEDIR=\"$(includedir)\" \
+       -DPKGINCLUDEDIR=\"$(pkgincludedir)\" 
 
-OBJ=preproc.o pgc.o type.o ecpg.o ecpg_keywords.o ../../../backend/parser/scansup.o \
-    keywords.o c_keywords.o ../lib/typename.o
+ifeq ($(GCC), yes)
+override CFLAGS += -Wno-error
+endif
 
-all:: ecpg
+OBJS=preproc.o type.o ecpg.o ecpg_keywords.o output.o\
+    keywords.o c_keywords.o ../ecpglib/typename.o descriptor.o variable.o
 
-preproc.c preproc.h: preproc.y
-       $(YACC) $(YFLAGS) $<
-       mv y.tab.c preproc.c
-       mv y.tab.h preproc.h
 
-clean:
-       rm -f *.o core a.out ecpg$(X) *~ *.output *.tab.?
+all: submake-libpgport ecpg
 
-install: all
-       $(INSTALL) $(INSTL_EXE_OPTS) ecpg$(X) $(DESTDIR)$(BINDIR)
+ecpg: $(OBJS)
+       $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LIBS) $(PTHREAD_LIBS) -o $@
 
-uninstall:
-       rm -f $(DESTDIR)$(BINDIR)/ecpg
+# pgc is compiled as part of preproc
+preproc.o: $(srcdir)/pgc.c
+
+$(srcdir)/preproc.c: $(srcdir)/preproc.h ;
+
+$(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
+
+$(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
 
-pgc.c: pgc.l
-       $(LEX) $<
-       mv lex.yy.c pgc.c
 
-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 
+distprep: $(srcdir)/preproc.c $(srcdir)/preproc.h $(srcdir)/pgc.c
+
+install: all installdirs
+       $(INSTALL_PROGRAM) ecpg$(X) $(DESTDIR)$(bindir)
+
+installdirs:
+       $(mkinstalldirs) $(DESTDIR)$(bindir)
+
+uninstall:
+       rm -f $(DESTDIR)$(bindir)/ecpg$(X)
+
+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