aboutsummaryrefslogtreecommitdiff
path: root/src/backend/utils
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/utils')
-rw-r--r--src/backend/utils/Makefile40
-rw-r--r--src/backend/utils/adt/Makefile7
-rw-r--r--src/backend/utils/cache/Makefile8
-rw-r--r--src/backend/utils/error/Makefile8
-rw-r--r--src/backend/utils/fmgr/Makefile16
-rw-r--r--src/backend/utils/hash/Makefile8
-rw-r--r--src/backend/utils/init/Makefile8
-rw-r--r--src/backend/utils/misc/Makefile8
-rw-r--r--src/backend/utils/mmgr/Makefile8
-rw-r--r--src/backend/utils/sort/Makefile8
-rw-r--r--src/backend/utils/time/Makefile8
11 files changed, 37 insertions, 90 deletions
diff --git a/src/backend/utils/Makefile b/src/backend/utils/Makefile
index 3f2efbaa9bb..887c7f0324a 100644
--- a/src/backend/utils/Makefile
+++ b/src/backend/utils/Makefile
@@ -4,7 +4,7 @@
# Makefile for utils
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/utils/Makefile,v 1.5 1997/12/20 00:28:17 scrappy Exp $
+# $Header: /cvsroot/pgsql/src/backend/utils/Makefile,v 1.6 1998/04/06 00:26:13 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -21,21 +21,14 @@ OBJS = fmgrtab.o adt/SUBSYS.o cache/SUBSYS.o error/SUBSYS.o \
fmgr/SUBSYS.o hash/SUBSYS.o init/SUBSYS.o misc/SUBSYS.o mmgr/SUBSYS.o \
sort/SUBSYS.o time/SUBSYS.o
+DIRS = adt cache error fmgr hash init misc mmgr sort time
+
SUBSYS.o: $(OBJS)
$(LD) -r -o SUBSYS.o $(OBJS)
.PHONY: submake clean dep
submake:
- $(MAKE) -C adt SUBSYS.o
- $(MAKE) -C cache SUBSYS.o
- $(MAKE) -C error SUBSYS.o
- $(MAKE) -C fmgr SUBSYS.o
- $(MAKE) -C hash SUBSYS.o
- $(MAKE) -C init SUBSYS.o
- $(MAKE) -C misc SUBSYS.o
- $(MAKE) -C mmgr SUBSYS.o
- $(MAKE) -C sort SUBSYS.o
- $(MAKE) -C time SUBSYS.o
+ for i in $(DIRS); do $(MAKE) -C $$i SUBSYS.o; done
fmgrtab.o: ../fmgr.h
@@ -47,29 +40,10 @@ fmgr.h fmgrtab.c: ./Gen_fmgrtab.sh ../../include/catalog/pg_proc.h
clean:
rm -f SUBSYS.o fmgr.h fmgrtab.o fmgrtab.c
- $(MAKE) -C adt clean
- $(MAKE) -C cache clean
- $(MAKE) -C error clean
- $(MAKE) -C fmgr clean
- $(MAKE) -C hash clean
- $(MAKE) -C init clean
- $(MAKE) -C misc clean
- $(MAKE) -C mmgr clean
- $(MAKE) -C sort clean
- $(MAKE) -C time clean
+ for i in $(DIRS); do $(MAKE) -C $$i clean; done
-dep: fmgr.h fmgrtab.c
- $(CC) -MM $(INCLUDE_OPT) *.c >depend
- $(MAKE) -C adt dep
- $(MAKE) -C cache dep
- $(MAKE) -C error dep
- $(MAKE) -C fmgr dep
- $(MAKE) -C hash dep
- $(MAKE) -C init dep
- $(MAKE) -C misc dep
- $(MAKE) -C mmgr dep
- $(MAKE) -C sort dep
- $(MAKE) -C time dep
+dep depend: fmgr.h fmgrtab.c
+ for i in $(DIRS); do $(MAKE) -C $$i depend; done
ifeq (depend,$(wildcard depend))
include depend
diff --git a/src/backend/utils/adt/Makefile b/src/backend/utils/adt/Makefile
index 75cc755f7cc..cd338b34bf6 100644
--- a/src/backend/utils/adt/Makefile
+++ b/src/backend/utils/adt/Makefile
@@ -4,16 +4,15 @@
# Makefile for utils/adt
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.11 1998/03/15 07:38:42 scrappy Exp $
+# $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.12 1998/04/06 00:26:19 momjian Exp $
#
#-------------------------------------------------------------------------
SRCDIR = ../../..
include ../../../Makefile.global
-INCLUDE_OPT = -I../..
+CFLAGS += -I../..
-CFLAGS+=$(INCLUDE_OPT)
ifdef MB
CFLAGS+=-DMB=$(MB)
endif
@@ -31,7 +30,7 @@ SUBSYS.o: $(OBJS)
$(LD) -r -o SUBSYS.o $(OBJS)
depend dep:
- $(CC) -MM $(INCLUDE_OPT) *.c >depend
+ $(CC) -MM $(CFLAGS) *.c >depend
clean:
rm -f SUBSYS.o $(OBJS)
diff --git a/src/backend/utils/cache/Makefile b/src/backend/utils/cache/Makefile
index 4f0582cd95a..46c267bbe53 100644
--- a/src/backend/utils/cache/Makefile
+++ b/src/backend/utils/cache/Makefile
@@ -4,16 +4,14 @@
# Makefile for utils/cache
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/utils/cache/Makefile,v 1.5 1997/12/20 00:28:29 scrappy Exp $
+# $Header: /cvsroot/pgsql/src/backend/utils/cache/Makefile,v 1.6 1998/04/06 00:26:33 momjian Exp $
#
#-------------------------------------------------------------------------
SRCDIR = ../../..
include ../../../Makefile.global
-INCLUDE_OPT = -I../..
-
-CFLAGS+=$(INCLUDE_OPT)
+CFLAGS += -I../..
OBJS = catcache.o inval.o rel.o relcache.o syscache.o lsyscache.o fcache.o
@@ -23,7 +21,7 @@ SUBSYS.o: $(OBJS)
$(LD) -r -o SUBSYS.o $(OBJS)
depend dep:
- $(CC) -MM $(INCLUDE_OPT) *.c >depend
+ $(CC) -MM $(CFLAGS) *.c >depend
clean:
rm -f SUBSYS.o $(OBJS)
diff --git a/src/backend/utils/error/Makefile b/src/backend/utils/error/Makefile
index b83fa3b40b6..20d7a9bc8b3 100644
--- a/src/backend/utils/error/Makefile
+++ b/src/backend/utils/error/Makefile
@@ -4,16 +4,14 @@
# Makefile for utils/error
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/utils/error/Makefile,v 1.4 1997/12/20 00:28:38 scrappy Exp $
+# $Header: /cvsroot/pgsql/src/backend/utils/error/Makefile,v 1.5 1998/04/06 00:26:45 momjian Exp $
#
#-------------------------------------------------------------------------
SRCDIR = ../../..
include ../../../Makefile.global
-INCLUDE_OPT = -I../..
-
-CFLAGS+=$(INCLUDE_OPT)
+CFLAGS += -I../..
OBJS = assert.o elog.o exc.o excabort.o excid.o format.o
@@ -23,7 +21,7 @@ SUBSYS.o: $(OBJS)
$(LD) -r -o SUBSYS.o $(OBJS)
depend dep:
- $(CC) -MM $(INCLUDE_OPT) *.c >depend
+ $(CC) -MM $(CFLAGS) *.c >depend
clean:
rm -f SUBSYS.o $(OBJS)
diff --git a/src/backend/utils/fmgr/Makefile b/src/backend/utils/fmgr/Makefile
index 1b354d11551..cf503d2cb87 100644
--- a/src/backend/utils/fmgr/Makefile
+++ b/src/backend/utils/fmgr/Makefile
@@ -4,24 +4,14 @@
# Makefile for utils/fmgr
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/utils/fmgr/Makefile,v 1.5 1997/12/20 00:28:47 scrappy Exp $
+# $Header: /cvsroot/pgsql/src/backend/utils/fmgr/Makefile,v 1.6 1998/04/06 00:26:52 momjian Exp $
#
#-------------------------------------------------------------------------
SRCDIR = ../../..
include ../../../Makefile.global
-INCLUDE_OPT = -I../..
-
-CFLAGS+=$(INCLUDE_OPT)
-
-ifeq ($(PORTNAME), linux)
-# LINUX_ELF tells us to use the ELF dynamic load facilities that come with
-# Linux.
- ifdef LINUX_ELF
- CFLAGS+=-DLINUX_ELF
- endif
-endif
+CFLAGS += -I../..
OBJS = dfmgr.o fmgr.o
@@ -31,7 +21,7 @@ SUBSYS.o: $(OBJS)
$(LD) -r -o SUBSYS.o $(OBJS)
depend dep:
- $(CC) -MM $(INCLUDE_OPT) *.c >depend
+ $(CC) -MM $(CFLAGS) *.c >depend
clean:
rm -f SUBSYS.o $(OBJS)
diff --git a/src/backend/utils/hash/Makefile b/src/backend/utils/hash/Makefile
index 75b1de172cb..419e204069f 100644
--- a/src/backend/utils/hash/Makefile
+++ b/src/backend/utils/hash/Makefile
@@ -4,16 +4,14 @@
# Makefile for utils/hash
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/utils/hash/Makefile,v 1.4 1997/12/20 00:28:58 scrappy Exp $
+# $Header: /cvsroot/pgsql/src/backend/utils/hash/Makefile,v 1.5 1998/04/06 00:26:58 momjian Exp $
#
#-------------------------------------------------------------------------
SRCDIR = ../../..
include ../../../Makefile.global
-INCLUDE_OPT = -I../..
-
-CFLAGS+=$(INCLUDE_OPT)
+CFLAGS += -I../..
OBJS = dynahash.o hashfn.o
@@ -23,7 +21,7 @@ SUBSYS.o: $(OBJS)
$(LD) -r -o SUBSYS.o $(OBJS)
depend dep:
- $(CC) -MM $(INCLUDE_OPT) *.c >depend
+ $(CC) -MM $(CFLAGS) *.c >depend
clean:
rm -f SUBSYS.o $(OBJS)
diff --git a/src/backend/utils/init/Makefile b/src/backend/utils/init/Makefile
index e1c7702f1e0..debf0299143 100644
--- a/src/backend/utils/init/Makefile
+++ b/src/backend/utils/init/Makefile
@@ -4,16 +4,14 @@
# Makefile for utils/init
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/utils/init/Makefile,v 1.6 1997/12/20 00:29:06 scrappy Exp $
+# $Header: /cvsroot/pgsql/src/backend/utils/init/Makefile,v 1.7 1998/04/06 00:27:07 momjian Exp $
#
#-------------------------------------------------------------------------
SRCDIR = ../../..
include ../../../Makefile.global
-INCLUDE_OPT = -I../..
-
-CFLAGS += $(INCLUDE_OPT)
+CFLAGS += -I../..
OBJS = enbl.o findbe.o globals.o miscinit.o postinit.o
@@ -23,7 +21,7 @@ SUBSYS.o: $(OBJS)
$(LD) -r -o SUBSYS.o $(OBJS)
depend dep:
- $(CC) -MM $(INCLUDE_OPT) *.c >depend
+ $(CC) -MM $(CFLAGS) *.c >depend
clean:
rm -f SUBSYS.o $(OBJS)
diff --git a/src/backend/utils/misc/Makefile b/src/backend/utils/misc/Makefile
index 537d95225d0..a827137ed00 100644
--- a/src/backend/utils/misc/Makefile
+++ b/src/backend/utils/misc/Makefile
@@ -4,16 +4,14 @@
# Makefile for utils/misc
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/utils/misc/Makefile,v 1.5 1997/12/20 00:29:12 scrappy Exp $
+# $Header: /cvsroot/pgsql/src/backend/utils/misc/Makefile,v 1.6 1998/04/06 00:27:16 momjian Exp $
#
#-------------------------------------------------------------------------
SRCDIR = ../../..
include ../../../Makefile.global
-INCLUDE_OPT = -I../..
-
-CFLAGS += $(INCLUDE_OPT)
+CFLAGS += -I../..
OBJS = database.o superuser.o
@@ -23,7 +21,7 @@ SUBSYS.o: $(OBJS)
$(LD) -r -o SUBSYS.o $(OBJS)
depend dep:
- $(CC) -MM $(INCLUDE_OPT) *.c >depend
+ $(CC) -MM $(CFLAGS) *.c >depend
clean:
rm -f SUBSYS.o $(OBJS)
diff --git a/src/backend/utils/mmgr/Makefile b/src/backend/utils/mmgr/Makefile
index 4ac58d6dad5..3d11b4fd372 100644
--- a/src/backend/utils/mmgr/Makefile
+++ b/src/backend/utils/mmgr/Makefile
@@ -4,16 +4,14 @@
# Makefile for utils/mmgr
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Makefile,v 1.4 1997/12/20 00:29:19 scrappy Exp $
+# $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Makefile,v 1.5 1998/04/06 00:27:24 momjian Exp $
#
#-------------------------------------------------------------------------
SRCDIR = ../../..
include ../../../Makefile.global
-INCLUDE_OPT = -I../..
-
-CFLAGS+=$(INCLUDE_OPT)
+CFLAGS += -I../..
OBJS = aset.o mcxt.o palloc.o portalmem.o oset.o
@@ -23,7 +21,7 @@ SUBSYS.o: $(OBJS)
$(LD) -r -o SUBSYS.o $(OBJS)
depend dep:
- $(CC) -MM $(INCLUDE_OPT) *.c >depend
+ $(CC) -MM $(CFLAGS) *.c >depend
clean:
rm -f SUBSYS.o $(OBJS)
diff --git a/src/backend/utils/sort/Makefile b/src/backend/utils/sort/Makefile
index 56dd66b726f..f2fb18dc6ce 100644
--- a/src/backend/utils/sort/Makefile
+++ b/src/backend/utils/sort/Makefile
@@ -4,16 +4,14 @@
# Makefile for utils/sort
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/utils/sort/Makefile,v 1.4 1997/12/20 00:29:29 scrappy Exp $
+# $Header: /cvsroot/pgsql/src/backend/utils/sort/Makefile,v 1.5 1998/04/06 00:27:37 momjian Exp $
#
#-------------------------------------------------------------------------
SRCDIR = ../../..
include ../../../Makefile.global
-INCLUDE_OPT = -I../..
-
-CFLAGS+=$(INCLUDE_OPT)
+CFLAGS += -I../..
OBJS = lselect.o psort.o
@@ -23,7 +21,7 @@ SUBSYS.o: $(OBJS)
$(LD) -r -o SUBSYS.o $(OBJS)
depend dep:
- $(CC) -MM $(INCLUDE_OPT) *.c >depend
+ $(CC) -MM $(CFLAGS) *.c >depend
clean:
rm -f SUBSYS.o $(OBJS)
diff --git a/src/backend/utils/time/Makefile b/src/backend/utils/time/Makefile
index c2c6f834a83..a9ac73909f3 100644
--- a/src/backend/utils/time/Makefile
+++ b/src/backend/utils/time/Makefile
@@ -4,16 +4,14 @@
# Makefile for utils/time
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/utils/time/Makefile,v 1.4 1997/12/20 00:29:35 scrappy Exp $
+# $Header: /cvsroot/pgsql/src/backend/utils/time/Makefile,v 1.5 1998/04/06 00:27:42 momjian Exp $
#
#-------------------------------------------------------------------------
SRCDIR = ../../..
include ../../../Makefile.global
-INCLUDE_OPT = -I../..
-
-CFLAGS+=$(INCLUDE_OPT)
+CFLAGS += -I../..
OBJS = tqual.o
@@ -23,7 +21,7 @@ SUBSYS.o: $(OBJS)
$(LD) -r -o SUBSYS.o $(OBJS)
depend dep:
- $(CC) -MM $(INCLUDE_OPT) *.c >depend
+ $(CC) -MM $(CFLAGS) *.c >depend
clean:
rm -f SUBSYS.o $(OBJS)
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-07 10:54:02 +0000