Fix distprep and maintainer-clean targets so that ecpg's .def files are

made and removed at the correct times.
This commit is contained in:
Tom Lane 2007-10-05 01:51:40 +00:00
parent b8f41d508c
commit eefd10c66c
3 changed files with 31 additions and 9 deletions

View File

@ -2,9 +2,10 @@
# #
# Makefile for ecpg compatibility library # Makefile for ecpg compatibility library
# #
# Copyright (c) 1994, Regents of the University of California # Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
# #
# $PostgreSQL: pgsql/src/interfaces/ecpg/compatlib/Makefile,v 1.35 2007/10/04 18:32:07 tgl Exp $ # $PostgreSQL: pgsql/src/interfaces/ecpg/compatlib/Makefile,v 1.36 2007/10/05 01:51:40 tgl Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -46,8 +47,12 @@ snprintf.c: % : $(top_srcdir)/src/port/%
# Since we can't assume that Windows boxes will have sed, the .DEF files are # Since we can't assume that Windows boxes will have sed, the .DEF files are
# always built and included in distribution tarballs. # always built and included in distribution tarballs.
distprep: def-files
.PHONY: def-files .PHONY: def-files
def-files: $(srcdir)/libecpg_compatdll.def $(srcdir)/blibecpg_compatdll.def def-files: $(srcdir)/libecpg_compatdll.def $(srcdir)/blibecpg_compatdll.def
$(srcdir)/libecpg_compatdll.def: exports.txt $(srcdir)/libecpg_compatdll.def: exports.txt
echo '; DEF file for MS VC++' > $@ echo '; DEF file for MS VC++' > $@
echo 'LIBRARY LIBECPG_COMPAT' >> $@ echo 'LIBRARY LIBECPG_COMPAT' >> $@
@ -93,5 +98,8 @@ installdirs:
uninstall: uninstall-lib uninstall: uninstall-lib
clean distclean maintainer-clean: clean-lib clean distclean: clean-lib
rm -f $(OBJS) snprintf.c exports.list rm -f $(OBJS) snprintf.c exports.list
maintainer-clean: distclean
rm -f $(srcdir)/libecpg_compatdll.def $(srcdir)/blibecpg_compatdll.def

View File

@ -2,9 +2,10 @@
# #
# Makefile for ecpg library # Makefile for ecpg library
# #
# Copyright (c) 1994, Regents of the University of California # Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
# #
# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.52 2007/10/04 20:54:08 tgl Exp $ # $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.53 2007/10/05 01:51:40 tgl Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -64,7 +65,10 @@ $(top_builddir)/src/port/pg_config_paths.h:
# Since we can't assume that Windows boxes will have sed, the .DEF files are # Since we can't assume that Windows boxes will have sed, the .DEF files are
# always built and included in distribution tarballs. # always built and included in distribution tarballs.
distprep: def-files
.PHONY: def-files .PHONY: def-files
def-files: $(srcdir)/libecpgdll.def $(srcdir)/blibecpgdll.def def-files: $(srcdir)/libecpgdll.def $(srcdir)/blibecpgdll.def
$(srcdir)/libecpgdll.def: exports.txt $(srcdir)/libecpgdll.def: exports.txt
@ -112,6 +116,9 @@ installdirs:
uninstall: uninstall-lib uninstall: uninstall-lib
clean distclean maintainer-clean: clean-lib clean distclean: clean-lib
rm -f $(OBJS) rm -f $(OBJS)
rm -f path.c pgstrcasecmp.c snprintf.c strlcpy.c thread.c exports.list rm -f path.c pgstrcasecmp.c snprintf.c strlcpy.c thread.c exports.list
maintainer-clean: distclean
rm -f $(srcdir)/libecpgdll.def $(srcdir)/blibecpgdll.def

View File

@ -2,9 +2,10 @@
# #
# Makefile for ecpg pgtypes library # Makefile for ecpg pgtypes library
# #
# Copyright (c) 1994, Regents of the University of California # Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
# #
# $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/Makefile,v 1.37 2007/10/04 18:32:07 tgl Exp $ # $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/Makefile,v 1.38 2007/10/05 01:51:40 tgl Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -44,7 +45,10 @@ include $(top_srcdir)/src/Makefile.shlib
# Since we can't assume that Windows boxes will have sed, the .DEF files are # Since we can't assume that Windows boxes will have sed, the .DEF files are
# always built and included in distribution tarballs. # always built and included in distribution tarballs.
distprep: def-files
.PHONY: def-files .PHONY: def-files
def-files: $(srcdir)/libpgtypesdll.def $(srcdir)/blibpgtypesdll.def def-files: $(srcdir)/libpgtypesdll.def $(srcdir)/blibpgtypesdll.def
$(srcdir)/libpgtypesdll.def: exports.txt $(srcdir)/libpgtypesdll.def: exports.txt
@ -100,5 +104,8 @@ installdirs:
uninstall: uninstall-lib uninstall: uninstall-lib
clean distclean maintainer-clean: clean-lib clean distclean: clean-lib
rm -f $(OBJS) pgstrcasecmp.c rint.c snprintf.c exports.list rm -f $(OBJS) pgstrcasecmp.c rint.c snprintf.c exports.list
maintainer-clean: distclean
rm -f $(srcdir)/libpgtypesdll.def $(srcdir)/blibpgtypesdll.def