diff options
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/port/Makefile.in | 17 | ||||
| -rw-r--r-- | src/backend/port/dynloader/bsd.c | 2 | ||||
| -rw-r--r-- | src/backend/utils/adt/numutils.c | 6 | ||||
| -rw-r--r-- | src/backend/utils/fmgr/dfmgr.c | 5 | ||||
| -rw-r--r-- | src/backend/utils/init/postinit.c | 3 |
5 files changed, 14 insertions, 19 deletions
diff --git a/src/backend/port/Makefile.in b/src/backend/port/Makefile.in index 3ce5b035e0..dc50d54ca0 100644 --- a/src/backend/port/Makefile.in +++ b/src/backend/port/Makefile.in @@ -19,33 +19,32 @@ # be converted to Method 2. # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/port/Attic/Makefile.in,v 1.7 1997/12/19 02:56:16 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/port/Attic/Makefile.in,v 1.8 1997/12/20 00:10:14 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR=../.. include ../../Makefile.global -OBJS = @PORTNAME@/SUBSYS.o @INET_ATON@ @STRERROR@ @RANDOM@ @SRANDOM@ +INCLUDE_OPT = -I.. + +CFLAGS+= INCLUDE_OPT + +OBJS = dynloader.o @INET_ATON@ @STRERROR@ @RANDOM@ @SRANDOM@ OBJS+= @GETHOSTNAME@ @GETRUSAGE@ @STRCASECMP@ @STRDUP@ -all: submake SUBSYS.o +all: SUBSYS.o SUBSYS.o: $(OBJS) $(LD) -r -o SUBSYS.o $(OBJS) -.PHONY: submake clean dep - -submake: - $(MAKE) -C @PORTNAME@ SUBSYS.o +.PHONY: clean dep clean: rm -f SUBSYS.o $(OBJS) - $(MAKE) -C @PORTNAME@ clean depend dep: $(CC) -MM $(INCLUDE_OPT) *.c >depend - $(MAKE) -C @PORTNAME@ $@ ifeq (depend,$(wildcard depend)) include depend diff --git a/src/backend/port/dynloader/bsd.c b/src/backend/port/dynloader/bsd.c index 42d15d840f..b1c0c3d1d3 100644 --- a/src/backend/port/dynloader/bsd.c +++ b/src/backend/port/dynloader/bsd.c @@ -44,7 +44,7 @@ static char sccsid[] = "@(#)dl.c 5.4 (Berkeley) 2/23/91"; #include <stdio.h> #include <stdlib.h> -#include "port-protos.h" +#include "dynloader.h" static char error_message[BUFSIZ]; diff --git a/src/backend/utils/adt/numutils.c b/src/backend/utils/adt/numutils.c index 6aae6b3614..01f187be7f 100644 --- a/src/backend/utils/adt/numutils.c +++ b/src/backend/utils/adt/numutils.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.18 1997/12/19 02:08:01 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.19 1997/12/20 00:10:29 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -28,10 +28,6 @@ #include <string.h> #endif -#ifndef HAVE_FCVT -# include <port-protos.h> /* ecvt(), fcvt() */ -#endif - #ifndef INT_MAX #define INT_MAX (0x7FFFFFFFL) #endif diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c index d67069406b..33c930d0a9 100644 --- a/src/backend/utils/fmgr/dfmgr.c +++ b/src/backend/utils/fmgr/dfmgr.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.13 1997/09/18 20:22:27 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.14 1997/12/20 00:10:42 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -26,7 +26,8 @@ #include "access/heapam.h" #include "nodes/pg_list.h" -#include "port-protos.h" /* system specific function prototypes */ +#include "dynloader.h" + #ifdef __ultrix #include <dl.h> #endif diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c index 56fcc81718..7a7e071946 100644 --- a/src/backend/utils/init/postinit.c +++ b/src/backend/utils/init/postinit.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.20 1997/11/24 05:09:17 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.21 1997/12/20 00:10:47 scrappy Exp $ * * NOTES * InitPostgres() is the function called from PostgresMain @@ -66,7 +66,6 @@ #include "catalog/catname.h" #include "catalog/pg_database.h" -#include "port-protos.h" #include "libpq/libpq-be.h" static void VerifySystemDatabase(void); |
