Move pg_crc.c to src/common, and remove pg_crc_tables.h

[postgresql] / src / port / Makefile

diff --git a/src/port/Makefile b/src/port/Makefile
index 7a01fbc3fb5a8da125313a31b4cecf42ec62e9d5..a0908bf5e3d45a82ca2b4b60f23bad978cdbf7f4 100644 (file)
--- a/src/port/Makefile
+++ b/src/port/Makefile
@@ -14,8 +14,12 @@
 #      libpgport_srv.a - contains object files without FRONTEND defined,
 #              for use only by the backend binaries
 #
+# LIBOBJS is set by configure (via Makefile.global) to be the list of object
+# files that are conditionally needed as determined by configure's probing.
+# OBJS adds additional object files that are always compiled.
+#
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/port/Makefile,v 1.20 2004/10/06 08:50:02 momjian Exp $
+#    src/port/Makefile
 #
 #-------------------------------------------------------------------------
 
@@ -26,51 +30,65 @@ include $(top_builddir)/src/Makefile.global
 override CPPFLAGS := -I$(top_builddir)/src/port -DFRONTEND $(CPPFLAGS)
 LIBS += $(PTHREAD_LIBS)
 
-# Replace object files that use FRONTEND define
-LIBOBJS_SRV := $(LIBOBJS)
-LIBOBJS_SRV := $(patsubst dirmod.o,dirmod_srv.o, $(LIBOBJS_SRV))
-LIBOBJS_SRV := $(patsubst exec.o,exec_srv.o, $(LIBOBJS_SRV))
-LIBOBJS_SRV := $(patsubst getaddrinfo.o,getaddrinfo_srv.o, $(LIBOBJS_SRV))
-LIBOBJS_SRV := $(patsubst thread.o,thread_srv.o, $(LIBOBJS_SRV))
+OBJS = $(LIBOBJS) chklocale.o dirmod.o erand48.o fls.o inet_net_ntop.o \
+       noblock.o path.o pgcheckdir.o pgmkdirp.o pgsleep.o \
+       pgstrcasecmp.o pqsignal.o \
+       qsort.o qsort_arg.o quotes.o sprompt.o tar.o thread.o
+
+# foo_srv.o and foo.o are both built from foo.c, but only foo.o has -DFRONTEND
+OBJS_SRV = $(OBJS:%.o=%_srv.o)
 
 all: libpgport.a libpgport_srv.a
 
 # libpgport is needed by some contrib
-install:
-       $(INSTALL_STLIB) libpgport.a $(DESTDIR)$(libdir)
+install: all installdirs
+       $(INSTALL_STLIB) libpgport.a '$(DESTDIR)$(libdir)/libpgport.a'
+
+installdirs:
+       $(MKDIR_P) '$(DESTDIR)$(libdir)'
 
 uninstall:
-       $(RM) $(DESTDIR)$(libdir)/libpgport.a
+       rm -f '$(DESTDIR)$(libdir)/libpgport.a'
 
-libpgport.a: $(LIBOBJS)
+libpgport.a: $(OBJS)
        $(AR) $(AROPT) $@ $^
 
-thread.o: thread.c
-       $(CC) $(CFLAGS) $(CPPFLAGS) $(PTHREAD_CFLAGS) -c $<
-
-path.o: path.c pg_config_paths.h
+# thread.o needs PTHREAD_CFLAGS (but thread_srv.o does not)
+thread.o: CFLAGS+=$(PTHREAD_CFLAGS)
 
 #
 # Server versions of object files
 #
 
-libpgport_srv.a: $(LIBOBJS_SRV)
+libpgport_srv.a: $(OBJS_SRV)
        $(AR) $(AROPT) $@ $^
 
-dirmod_srv.o: dirmod.c
+# Because this uses its own compilation rule, it doesn't use the
+# dependency tracking logic from Makefile.global.  To make sure that
+# dependency tracking works anyway for the *_srv.o files, depend on
+# their *.o siblings as well, which do have proper dependencies.  It's
+# a hack that might fail someday if there is a *_srv.o without a
+# corresponding *.o, but it works for now (and those would probably go
+# into src/backend/port/ anyway).
+%_srv.o: %.c %.o
        $(CC) $(CFLAGS) $(subst -DFRONTEND,, $(CPPFLAGS)) -c $< -o $@
 
-exec_srv.o: exec.c
-       $(CC) $(CFLAGS) $(subst -DFRONTEND,, $(CPPFLAGS)) -c $< -o $@
+$(OBJS_SRV): | submake-errcodes
 
-getaddrinfo_srv.o: getaddrinfo.c
-       $(CC) $(CFLAGS) $(subst -DFRONTEND,, $(CPPFLAGS)) -c $< -o $@
+.PHONY: submake-errcodes
 
-# No thread flags for server version
-thread_srv.o: thread.c
-       $(CC) $(CFLAGS) $(subst -DFRONTEND,, $(CPPFLAGS)) -c $< -o $@
+submake-errcodes:
+       $(MAKE) -C ../backend submake-errcodes
 
 # Dependency is to ensure that path changes propagate
+
+path.o: path.c pg_config_paths.h
+
+path_srv.o: path.c pg_config_paths.h
+
+# We create a separate file rather than put these in pg_config.h
+# because many of these values come from makefiles and are not
+# available to configure.
 pg_config_paths.h: $(top_builddir)/src/Makefile.global
        echo "#define PGBINDIR \"$(bindir)\"" >$@
        echo "#define PGSHAREDIR \"$(datadir)\"" >>$@
@@ -81,6 +99,9 @@ pg_config_paths.h: $(top_builddir)/src/Makefile.global
        echo "#define LIBDIR \"$(libdir)\"" >>$@
        echo "#define PKGLIBDIR \"$(pkglibdir)\"" >>$@
        echo "#define LOCALEDIR \"$(localedir)\"" >>$@
+       echo "#define DOCDIR \"$(docdir)\"" >>$@
+       echo "#define HTMLDIR \"$(htmldir)\"" >>$@
+       echo "#define MANDIR \"$(mandir)\"" >>$@
 
 clean distclean maintainer-clean:
-       rm -f libpgport.a libpgport_srv.a $(LIBOBJS) $(LIBOBJS_SRV) pg_config_paths.h
+       rm -f libpgport.a libpgport_srv.a $(OBJS) $(OBJS_SRV) pg_config_paths.h