diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/Makefile | 18 | ||||
| -rw-r--r-- | src/port/getopt_long.c | 11 |
2 files changed, 17 insertions, 12 deletions
diff --git a/src/backend/Makefile b/src/backend/Makefile index 9a194654b94..2bbdc8eb369 100644 --- a/src/backend/Makefile +++ b/src/backend/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/backend/Makefile,v 1.107.4.1 2005/01/26 21:57:32 tgl Exp $ +# $PostgreSQL: pgsql/src/backend/Makefile,v 1.107.4.2 2005/08/02 01:35:22 tgl Exp $ # #------------------------------------------------------------------------- @@ -17,19 +17,21 @@ DIRS := access bootstrap catalog parser commands executor lib libpq \ main nodes optimizer port postmaster regex rewrite \ storage tcop utils $(top_builddir)/src/timezone -OBJS := $(DIRS:%=%/SUBSYS.o) +SUBSYSOBJS := $(DIRS:%=%/SUBSYS.o) + +OBJS := $(SUBSYSOBJS) $(top_builddir)/src/port/libpgport_srv.a + +# We put libpgport into OBJS, so remove it from LIBS +LIBS := $(patsubst -lpgport, , $(LIBS)) ifeq ($(PORTNAME), qnx4) # This file crashes qnx4's wlink and is therefore not in # bootstrap/SUBSYS.o on that platform. (Wotta hack ... is it still # necessary?) [ Yes, until the Watcom compiler goes open source it's # effectively unsupported ] -OBJS+= bootstrap/bootstrap.o +OBJS += bootstrap/bootstrap.o endif -# Use server version of port library -LIBS := $(patsubst -lpgport,-lpgport_srv, $(LIBS)) - ########################################################################## all: submake-libpgport postgres $(POSTGRES_IMP) @@ -69,7 +71,7 @@ postgres: $(OBJS) $(DLLINIT) postgres.def libpostgres.a $(WIN32RES) rm -f $@.exp $@.base postgres.def: $(OBJS) - $(DLLTOOL) --export-all --output-def $@ $^ $(top_builddir)/src/port/libpgport.a + $(DLLTOOL) --export-all --output-def $@ $^ libpostgres.a: postgres.def $(DLLTOOL) --dllname postgres.exe --def postgres.def --output-lib $@ @@ -98,7 +100,7 @@ endif endif # aix # Parallel make trickery -$(OBJS): $(DIRS:%=%-recursive) ; +$(SUBSYSOBJS): $(DIRS:%=%-recursive) ; .PHONY: $(DIRS:%=%-recursive) # Update the commonly used headers before building the subdirectories diff --git a/src/port/getopt_long.c b/src/port/getopt_long.c index 4c1f65d7767..d4d875f14b0 100644 --- a/src/port/getopt_long.c +++ b/src/port/getopt_long.c @@ -35,19 +35,22 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $PostgreSQL: pgsql/src/port/getopt_long.c,v 1.3 2003/11/29 19:52:13 pgsql Exp $ + * $PostgreSQL: pgsql/src/port/getopt_long.c,v 1.3.4.1 2005/08/02 01:35:23 tgl Exp $ */ -#include <stdio.h> -#include <stdlib.h> -#include <string.h> +#include "c.h" #include "getopt_long.h" +#ifndef HAVE_INT_OPTRESET +int optreset; +#endif + #define BADCH '?' #define BADARG ':' #define EMSG "" + int getopt_long(int argc, char *const argv[], const char *optstring, |