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 41d2571978d23ca5aec994058c9b690ad991659f..08be3bd699d9aa450b08e2eacff2ac084178ba0b 100644 (file)
--- a/src/backend/utils/misc/Makefile
+++ b/src/backend/utils/misc/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for utils/misc
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/utils/misc/Makefile,v 1.26 2006/07/25 03:51:21 tgl Exp $
+#    src/backend/utils/misc/Makefile
 #
 #-------------------------------------------------------------------------
 
@@ -12,9 +12,10 @@ subdir = src/backend/utils/misc
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
+override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
 
-OBJS = guc.o help_config.o pg_rusage.o ps_status.o superuser.o tzparser.o
+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 pg_config.h.
@@ -22,16 +23,12 @@ ifdef krb_srvtab
 override CPPFLAGS += -DPG_KRB_SRVTAB='"$(krb_srvtab)"'
 endif
 
-
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
+include $(top_srcdir)/src/backend/common.mk
 
 # guc-file is compiled as part of guc
-guc.o: $(srcdir)/guc-file.c
+guc.o: guc-file.c
 
-$(srcdir)/guc-file.c: guc-file.l
+guc-file.c: guc-file.l
 ifdef FLEX
        $(FLEX) $(FLEXFLAGS) -o'$@' $<
 else
@@ -40,13 +37,5 @@ 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)
+clean:
        @rm -f lex.yy.c
-
-depend dep:
-       $(CC) -MM $(CFLAGS) *.c >depend
-
-ifeq (depend,$(wildcard depend))
-include depend
-endif