Update copyright for the year 2010.

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

diff --git a/src/interfaces/ecpg/ecpglib/Makefile b/src/interfaces/ecpg/ecpglib/Makefile
index 0cc752d22e2410972a51f005c5ce9656a5a07012..6bbe131c411e56f9ab79f538e323896379f1d662 100644 (file)
--- a/src/interfaces/ecpg/ecpglib/Makefile
+++ b/src/interfaces/ecpg/ecpglib/Makefile
@@ -2,9 +2,10 @@
 #
 # Makefile for ecpg library
 #
-# Copyright (c) 1994, Regents of the University of California
+# Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
+# Portions Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.33 2005/03/14 17:27:50 momjian Exp $
+# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.65 2010/01/02 16:58:11 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -13,29 +14,41 @@ top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME= ecpg
-SO_MAJOR_VERSION= 5
-SO_MINOR_VERSION= 1
-DLTYPE= library
+SO_MAJOR_VERSION= 6
+SO_MINOR_VERSION= 2
 
-override CPPFLAGS := -DFRONTEND -I$(top_srcdir)/src/interfaces/ecpg/include \
+override CPPFLAGS := -I../include -I$(top_srcdir)/src/interfaces/ecpg/include \
        -I$(libpq_srcdir) -I$(top_builddir)/src/port $(CPPFLAGS)
 override CFLAGS += $(PTHREAD_CFLAGS)
 
-# Need to recomple any libpgport object files
-LIBS := $(patsubst -lpgport,, $(LIBS))
+# Need to recompile any libpgport object files
+LIBS := $(filter-out -lpgport, $(LIBS))
 
 OBJS= execute.o typename.o descriptor.o data.o error.o prepare.o memory.o \
-       connect.o misc.o path.o exec.o
+       connect.o misc.o path.o pgstrcasecmp.o \
+       $(filter snprintf.o strlcpy.o, $(LIBOBJS))
 
-SHLIB_LINK = -L../pgtypeslib -lpgtypes $(libpq) \
-       $(filter -lintl -lssl -lcrypto -lkrb5 -lcrypt -lm, $(LIBS)) $(PTHREAD_LIBS)
+# thread.c is needed only for non-WIN32 implementation of path.c
+ifneq ($(PORTNAME), win32)
+OBJS += thread.o
+endif
+
+SHLIB_LINK = -L../pgtypeslib -lpgtypes $(libpq) $(filter -lintl -lm, $(LIBS)) $(PTHREAD_LIBS)
+
+SHLIB_EXPORTS = exports.txt
 
 ifeq ($(PORTNAME), win32)
 # Link to shfolder.dll instead of shell32.dll
 SHLIB_LINK += -lshfolder
 endif
 
-all: all-lib
+all: libpq pgtypeslib all-lib
+
+libpq:
+       $(MAKE) -C $(top_builddir)/src/interfaces/libpq all
+
+pgtypeslib:
+       $(MAKE) -C $(top_builddir)/src/interfaces/ecpg/pgtypeslib all
 
 # Shared library stuff
 include $(top_srcdir)/src/Makefile.shlib
@@ -45,12 +58,10 @@ include $(top_srcdir)/src/Makefile.shlib
 # necessarily use the same object files as the backend uses. Instead,
 # symlink the source files in here and build our own object file.
 
-path.c: % : $(top_srcdir)/src/port/%
-       rm -f $@ && $(LN_S) $< .
-
-exec.c: % : $(top_srcdir)/src/port/%
+path.c pgstrcasecmp.c snprintf.c strlcpy.c thread.c: % : $(top_srcdir)/src/port/%
        rm -f $@ && $(LN_S) $< .
 
+misc.o: misc.c $(top_builddir)/src/port/pg_config_paths.h
 path.o: path.c $(top_builddir)/src/port/pg_config_paths.h
 
 $(top_builddir)/src/port/pg_config_paths.h:
@@ -58,17 +69,12 @@ $(top_builddir)/src/port/pg_config_paths.h:
 
 install: all installdirs install-lib
 
-installdirs:
-       $(mkinstalldirs) $(DESTDIR)$(libdir)
+installdirs: installdirs-lib
 
 uninstall: uninstall-lib
 
-clean distclean maintainer-clean: clean-lib
-       rm -f $(OBJS) path.c exec.c
+clean distclean: clean-lib
+       rm -f $(OBJS)
+       rm -f path.c pgstrcasecmp.c snprintf.c strlcpy.c thread.c
 
-depend dep:
-       $(CC) -MM $(CFLAGS) *.c >depend
-
-ifeq (depend,$(wildcard depend))
-include depend
-endif
+maintainer-clean: distclean maintainer-clean-lib