diff options
| author | Bruce Momjian | 2004-04-30 04:31:52 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2004-04-30 04:31:52 +0000 |
| commit | 7146eb0bc3d1cf0ebc9f6cff3c1cf2e5f2c177d4 (patch) | |
| tree | 23da18374106d29886bafb50e0c0394363914cf1 /src | |
| parent | 7d6f37b8c0309e9f0f10f62dcef48e12eb3ffd75 (diff) | |
Integrate timezone library to be called only from Win32.
Timezone code backend integration done by Magnus Hagander.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 5 | ||||
| -rw-r--r-- | src/Makefile.global.in | 4 | ||||
| -rw-r--r-- | src/timezone/Makefile | 12 |
3 files changed, 14 insertions, 7 deletions
diff --git a/src/Makefile b/src/Makefile index c1996cc1b4a..a42b0620e01 100644 --- a/src/Makefile +++ b/src/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/Makefile,v 1.31 2004/04/26 00:48:38 momjian Exp $ +# $PostgreSQL: pgsql/src/Makefile,v 1.32 2004/04/30 04:31:52 momjian Exp $ # #------------------------------------------------------------------------- @@ -15,6 +15,7 @@ include Makefile.global all install installdirs uninstall dep depend distprep: $(MAKE) -C port $@ + $(MAKE) -C timezone $@ $(MAKE) -C backend $@ $(MAKE) -C backend/utils/mb/conversion_procs $@ $(MAKE) -C include $@ @@ -27,6 +28,7 @@ install-all-headers: clean: $(MAKE) -C port $@ + $(MAKE) -C timezone $@ $(MAKE) -C backend $@ $(MAKE) -C include $@ $(MAKE) -C interfaces $@ @@ -39,6 +41,7 @@ clean: distclean maintainer-clean: -$(MAKE) -C port $@ + -$(MAKE) -C timezone $@ -$(MAKE) -C backend $@ -$(MAKE) -C include $@ -$(MAKE) -C interfaces $@ diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 9d6e1b41043..66f1a56652f 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -1,5 +1,5 @@ # -*-makefile-*- -# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.178 2004/04/23 18:15:53 momjian Exp $ +# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.179 2004/04/30 04:31:52 momjian Exp $ #------------------------------------------------------------------------------ # All PostgreSQL makefiles include this file and use the variables it sets, @@ -150,6 +150,8 @@ TK_XINCLUDES = @TK_XINCLUDES@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@ +PGTZ = @PGTZ@ + have_docbook = @have_docbook@ DOCBOOKSTYLE = @DOCBOOKSTYLE@ COLLATEINDEX = @COLLATEINDEX@ diff --git a/src/timezone/Makefile b/src/timezone/Makefile index b087b818ffc..b94bb663f24 100644 --- a/src/timezone/Makefile +++ b/src/timezone/Makefile @@ -4,26 +4,26 @@ # Makefile for the timezone library # IDENTIFICATION -# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.1 2004/04/30 04:09:23 momjian Exp $ +# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.2 2004/04/30 04:31:52 momjian Exp $ # #------------------------------------------------------------------------- -subdir = src/port/tz -top_builddir = ../../.. +subdir = src/tz +top_builddir = ../.. include $(top_builddir)/src/Makefile.global OBJS= asctime.o difftime.o localtime.o pgtz.o -ZICOBJS= zic.o ialloc.o scheck.o localtime.o asctime.o pgtz.o ../path.o +ZICOBJS= zic.o ialloc.o scheck.o localtime.o asctime.o pgtz.o TZDATA := africa antarctica asia australasia europe northamerica southamerica pacificnew etcetera factory backward systemv solar87 solar88 solar89 TZDATAFILES := $(TZDATA:%=data/%) +ifeq ($(PGTZ), yes) all: SUBSYS.o zic SUBSYS.o: $(OBJS) $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS) - zic: $(ZICOBJS) install: zic @@ -31,3 +31,5 @@ install: zic clean distclean maintainer-clean: rm -f SUBSYS.o $(OBJS) $(ZICOBJS) +endif + |