Message style improvements

[postgresql] / src / backend / utils / adt / Makefile

diff --git a/src/backend/utils/adt/Makefile b/src/backend/utils/adt/Makefile
index f6a19ed596893bd0a72348726abee74d4e898e95..5a1996c3439461cece6b6f06df8c21c85a5c9c38 100644 (file)
--- a/src/backend/utils/adt/Makefile
+++ b/src/backend/utils/adt/Makefile
@@ -1,45 +1,38 @@
-#-------------------------------------------------------------------------
 #
-# Makefile--
-#    Makefile for utils/adt
+# Makefile for utils/adt
 #
-# IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.25 1999/07/22 18:30:08 momjian Exp $
+# $PostgreSQL: pgsql/src/backend/utils/adt/Makefile,v 1.60 2006/04/05 22:11:55 tgl Exp $
 #
-#-------------------------------------------------------------------------
 
-SRCDIR = ../../..
-include ../../../Makefile.global
-
-CFLAGS += -I../..
+subdir = src/backend/utils/adt
+top_builddir = ../../../..
+include $(top_builddir)/src/Makefile.global
 
 # seems to be required for some date/time stuff 1999/07/22 bjm
-ifeq ($(CPU),alpha)
-ifeq ($(CC), gcc)
-CFLAGS+= -mieee
-endif
-ifeq ($(CC), egcs)
-CFLAGS+= -mieee
+ifeq "$(findstring alpha,$(host_cpu))" "alpha"
+ifeq "$(GCC)" "yes"
+override CFLAGS+= -mieee
 endif
 endif
 
-ifdef MULTIBYTE
-CFLAGS+= $(MBFLAGS)
-endif
-
-OBJS = acl.o arrayfuncs.o arrayutils.o bool.o cash.o char.o chunk.o \
-       date.o datetime.o datum.o dt.o filename.o float.o \
-       geo_ops.o geo_selfuncs.o int.o int8.o like.o \
+OBJS = acl.o arrayfuncs.o array_userfuncs.o arrayutils.o bool.o \
+       cash.o char.o date.o datetime.o datum.o domains.o \
+       float.o format_type.o \
+       geo_ops.o geo_selfuncs.o int.o int8.o like.o lockfuncs.o \
        misc.o nabstime.o name.o not_in.o numeric.o numutils.o \
-       oid.o oracle_compat.o \
-       regexp.o regproc.o ruleutils.o selfuncs.o sets.o \
-       tid.o timestamp.o varchar.o varlena.o version.o \
-       network.o mac.o inet_net_ntop.o inet_net_pton.o
+       oid.o oracle_compat.o pseudotypes.o rowtypes.o \
+       regexp.o regproc.o ruleutils.o selfuncs.o \
+       tid.o timestamp.o varbit.o varchar.o varlena.o version.o xid.o \
+       network.o mac.o inet_net_ntop.o inet_net_pton.o \
+       ri_triggers.o pg_lzcompress.o pg_locale.o formatting.o \
+       ascii.o quote.o pgstatfuncs.o encode.o dbsize.o genfile.o
+
+like.o: like.c like_match.c
 
 all: SUBSYS.o
 
 SUBSYS.o: $(OBJS)
-       $(LD) -r -o SUBSYS.o $(OBJS)
+       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
 
 depend dep:
        $(CC) -MM $(CFLAGS) *.c >depend