diff options
| author | Bruce Momjian <bruce@momjian.us> | 2002-07-16 05:46:36 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2002-07-16 05:46:36 +0000 |
| commit | 3cbb9eb2650bd39997e1bd1236622e1d7260c978 (patch) | |
| tree | ae9c67debdd04950664dcf47114ec818e92bab60 /src/Makefile.shlib | |
| parent | d76eef3e7cca5165941a5ef08e71f6a7c722b7bd (diff) | |
| download | postgresql-3cbb9eb2650bd39997e1bd1236622e1d7260c978.tar.gz | |
Move few remaining src/utils files to backend/port so everything is in
one place. Everything may be moved to src/utils eventually.
Add DLLINIT variable to simplify makfiles.
Diffstat (limited to 'src/Makefile.shlib')
| -rw-r--r-- | src/Makefile.shlib | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Makefile.shlib b/src/Makefile.shlib index 06e0060df0..8b4145b12a 100644 --- a/src/Makefile.shlib +++ b/src/Makefile.shlib @@ -6,7 +6,7 @@ # Copyright (c) 1998, Regents of the University of California # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.58 2002/05/24 18:10:17 petere Exp $ +# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.59 2002/07/16 05:46:35 momjian Exp $ # #------------------------------------------------------------------------- @@ -327,13 +327,13 @@ endif # PORTNAME == aix else # PORTNAME == win # WIN case -$(shlib) lib$(NAME).a: $(OBJS) $(top_builddir)/src/utils/dllinit.o +$(shlib) lib$(NAME).a: $(OBJS) $(DLLINIT) $(DLLTOOL) --export-all --output-def $(NAME).def $(OBJS) - $(DLLWRAP) -o $(shlib) --dllname $(shlib) --def $(NAME).def $(OBJS) $(top_builddir)/src/utils/dllinit.o $(DLLINIT) $(DLLLIBS) $(SHLIB_LINK) + $(DLLWRAP) -o $(shlib) --dllname $(shlib) --def $(NAME).def $(OBJS) $(DLLINIT) $(DLLLIBS) $(SHLIB_LINK) $(DLLTOOL) --dllname $(shlib) --def $(NAME).def --output-lib lib$(NAME).a -$(top_builddir)/src/utils/dllinit.o: $(top_srcdir)/src/utils/dllinit.c - $(MAKE) -C $(top_builddir)/src/utils dllinit.o +$(DLLINIT): + $(MAKE) -C $(@D) $(@F) endif # PORTNAME == win |
