Introduce timeout handling framework

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

diff --git a/src/backend/utils/misc/Makefile b/src/backend/utils/misc/Makefile
index d5f5843a7382961f016eb6a0a2d759160770de50..08be3bd699d9aa450b08e2eacff2ac084178ba0b 100644 (file)
--- a/src/backend/utils/misc/Makefile
+++ b/src/backend/utils/misc/Makefile
@@ -1,40 +1,41 @@
-# $Header: /cvsroot/pgsql/src/backend/utils/misc/Makefile,v 1.17 2000/08/25 10:00:31 petere Exp $
+#-------------------------------------------------------------------------
+#
+# Makefile--
+#    Makefile for utils/misc
+#
+# IDENTIFICATION
+#    src/backend/utils/misc/Makefile
+#
+#-------------------------------------------------------------------------
 
 subdir = src/backend/utils/misc
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = database.o superuser.o guc.o guc-file.o ps_status.o
+override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
+
+OBJS = guc.o help_config.o pg_rusage.o ps_status.o rbtree.o \
+       superuser.o timeout.o tzparser.o
 
 # This location might depend on the installation directories. Therefore
-# we can't subsitute it into config.h.
+# we can't subsitute it into pg_config.h.
 ifdef krb_srvtab
-CPPFLAGS += -DPG_KRB_SRVTAB='"$(krb_srvtab)"'
+override CPPFLAGS += -DPG_KRB_SRVTAB='"$(krb_srvtab)"'
 endif
 
+include $(top_srcdir)/src/backend/common.mk
 
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
+# guc-file is compiled as part of guc
+guc.o: guc-file.c
 
 guc-file.c: guc-file.l
-       $(LEX) $(LFLAGS) $<
-       sed -e 's/lex\.yy\.c/guc-file\.c/g' \
-           -e 's/^yy/GUC_yy/g' \
-           -e 's/\([^a-zA-Z0-9_]\)yy/\1GUC_yy/g' < lex.yy.c > $@
-       rm -f lex.yy.c
-
+ifdef FLEX
+       $(FLEX) $(FLEXFLAGS) -o'$@' $<
+else
+       @$(missing) flex $< $@
+endif
 
 # Note: guc-file.c is not deleted by 'make clean',
 # since we want to ship it in distribution tarballs.
-
-clean: 
-       rm -f SUBSYS.o $(OBJS) lex.yy.c
-
-depend dep:
-       $(CC) -MM $(CFLAGS) *.c >depend
-
-ifeq (depend,$(wildcard depend))
-include depend
-endif
+clean:
+       @rm -f lex.yy.c