From: Bruce Momjian Date: Wed, 13 Oct 1999 11:38:42 +0000 (+0000) Subject: Hi, X-Git-Tag: REL7_0~1310 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c3ac9f07b7bf2f764155a9b0e97c761fa780ac27;p=postgresql Hi, I have changed a bit the makefiles for the win32 port - the *.def files (created when building shared libraries) are now clean from Makefile.shlib. I have also removed "-g" from CFLAGS in the "cygwin32" template - it can be enabled when running configure. Dan --- diff --git a/src/Makefile.shlib b/src/Makefile.shlib index 6d2a5a914e..4b1beeaf2a 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.15 1999/09/27 20:54:56 momjian Exp $ +# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.16 1999/10/13 11:38:34 momjian Exp $ # #------------------------------------------------------------------------- @@ -274,3 +274,6 @@ endif clean-shlib: rm -f $(shlib) lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) lib$(NAME)$(DLSUFFIX) +ifeq ($(PORTNAME), win) + rm -rf $(NAME).def +endif diff --git a/src/interfaces/ecpg/lib/Makefile.in b/src/interfaces/ecpg/lib/Makefile.in index b636bceb5f..406407b02a 100644 --- a/src/interfaces/ecpg/lib/Makefile.in +++ b/src/interfaces/ecpg/lib/Makefile.in @@ -6,7 +6,7 @@ # Copyright (c) 1994, Regents of the University of California # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/Makefile.in,v 1.48 1999/10/08 11:04:59 meskes Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/Makefile.in,v 1.49 1999/10/13 11:38:35 momjian Exp $ # #------------------------------------------------------------------------- @@ -44,9 +44,6 @@ typename.o : typename.c ../include/ecpgtype.h clean: clean-shlib rm -f lib$(NAME).a $(OBJS) -ifeq ($(PORTNAME), win) - rm -f $(NAME).def -endif depend dep: $(CC) -MM $(CFLAGS) *.c >depend diff --git a/src/interfaces/libpq/Makefile.in b/src/interfaces/libpq/Makefile.in index e67ee1d2ca..f614c01cc4 100644 --- a/src/interfaces/libpq/Makefile.in +++ b/src/interfaces/libpq/Makefile.in @@ -6,7 +6,7 @@ # Copyright (c) 1994, Regents of the University of California # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.48 1999/10/11 17:47:01 momjian Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.49 1999/10/13 11:38:37 momjian Exp $ # #------------------------------------------------------------------------- @@ -88,9 +88,6 @@ install-headers: libpq-fe.h libpq-int.h clean: clean-shlib rm -f lib$(NAME).a $(OBJS) rm -f dllist.c common.c wchar.c conv.c big5.c -ifeq ($(PORTNAME), win) - rm -f pq.def -endif depend dep: $(CC) -MM $(CFLAGS) *.c >depend diff --git a/src/pl/plpgsql/src/Makefile.in b/src/pl/plpgsql/src/Makefile.in index c69fdb7af6..2972a351c6 100644 --- a/src/pl/plpgsql/src/Makefile.in +++ b/src/pl/plpgsql/src/Makefile.in @@ -4,7 +4,7 @@ # Makefile for the plpgsql shared object # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/Makefile.in,v 1.17 1999/06/30 23:57:31 tgl Exp $ +# $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/Makefile.in,v 1.18 1999/10/13 11:38:40 momjian Exp $ # #------------------------------------------------------------------------- @@ -82,6 +82,3 @@ clean: clean-shlib rm -f *.o pl.tab.h pl_gram.c pl_scan.c # And the garbage that might have been left behind by partial build: rm -f y.tab.c y.tab.h lex.yy.c -ifeq ($(PORTNAME), win) - rm -f $(NAME).def -endif diff --git a/src/template/cygwin32 b/src/template/cygwin32 index 4e64378295..0a5d841cd9 100644 --- a/src/template/cygwin32 +++ b/src/template/cygwin32 @@ -1,5 +1,5 @@ AROPT:crs -CFLAGS:-O2 -g +CFLAGS:-O2 SHARED_LIB: ALL: SRCH_INC:/usr/local/include