diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2004-11-16 21:51:13 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2004-11-16 21:51:13 +0000 |
| commit | bb85f1b9b13f0a94e782c3ada9e21aa1ba98cc7a (patch) | |
| tree | d5f3590f498bca0f3204acbe2904c655f90c5d43 /src | |
| parent | 6beb6fa495b4a688cae7574f961d522781b99824 (diff) | |
| download | postgresql-bb85f1b9b13f0a94e782c3ada9e21aa1ba98cc7a.tar.gz postgresql-bb85f1b9b13f0a94e782c3ada9e21aa1ba98cc7a.zip | |
Suppress duplicate rules for lib$(NAME).a on WIN32 and Cygwin.
Andrew Dunstan
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.shlib | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/Makefile.shlib b/src/Makefile.shlib index 4bd35655452..274e11fcb49 100644 --- a/src/Makefile.shlib +++ b/src/Makefile.shlib @@ -6,7 +6,7 @@ # Copyright (c) 1998, Regents of the University of California # # IDENTIFICATION -# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.86 2004/10/16 03:26:43 momjian Exp $ +# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.87 2004/11/16 21:51:13 tgl Exp $ # #------------------------------------------------------------------------- @@ -220,10 +220,12 @@ ifeq ($(PORTNAME), cygwin) shlib = $(NAME)$(DLSUFFIX) # needed for /contrib modules, not sure why SHLIB_LINK += -lpgport + haslibarule = yes endif ifeq ($(PORTNAME), win32) shlib = lib$(NAME)$(DLSUFFIX) + haslibarule = yes endif ifeq ($(PORTNAME), beos) @@ -257,6 +259,7 @@ ifndef LORDER MK_NO_LORDER := true endif +ifndef haslibarule lib$(NAME).a: $(OBJS) ifdef MK_NO_LORDER $(LINK.static) $@ $^ @@ -264,6 +267,7 @@ else $(LINK.static) $@ `$(LORDER) $^ | tsort` endif $(RANLIB) $@ +endif #haslibarule ifeq ($(enable_shared), yes) |