mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Recreate ecpg_config.h with a stamp file created by config.status, same

Browse Source 
way pg_config.h is handled.  This avoids reruns of config.status on every
build, if configure has been rerun.
This commit is contained in:
Peter Eisentraut 2009-01-22 22:27:13 +00:00
parent 3cb5d6580a
commit 9c4b69ed5c
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure vendored
View File

@ -28349,6 +28349,7 @@ echo "$as_me: WARNING: *** link for $FILE -- please fix by hand" >&2;}
# Update timestamp for pg_config.h (see Makefile.global)
echo >src/include/stamp-h
;;
"src/interfaces/ecpg/include/ecpg_config.h":H) echo >src/interfaces/ecpg/include/stamp-h ;;
esac
done # for ac_tag

5
configure.in
View File

@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
dnl $PostgreSQL: pgsql/configure.in,v 1.588 2009/01/21 10:30:02 mha Exp $
dnl $PostgreSQL: pgsql/configure.in,v 1.589 2009/01/22 22:27:12 petere Exp $
dnl
dnl Developers, please strive to achieve this order:
dnl
@ -1841,7 +1841,8 @@ AC_CONFIG_HEADERS([src/include/pg_config.h],
echo >src/include/stamp-h
])
AC_CONFIG_HEADERS([src/interfaces/ecpg/include/ecpg_config.h])
AC_CONFIG_HEADERS([src/interfaces/ecpg/include/ecpg_config.h],
[echo >src/interfaces/ecpg/include/stamp-h])
AC_OUTPUT

10
src/Makefile.global.in
View File

@ -1,5 +1,5 @@
# -*-makefile-*-
# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.251 2009/01/05 10:25:59 petere Exp $
# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.252 2009/01/22 22:27:13 petere Exp $
#------------------------------------------------------------------------------
# All PostgreSQL makefiles include this file and use the variables it sets,
@ -498,9 +498,11 @@ $(top_builddir)/src/include/pg_config.h: $(top_builddir)/src/include/stamp-h
$(top_builddir)/src/include/stamp-h: $(top_srcdir)/src/include/pg_config.h.in $(top_builddir)/config.status
cd $(top_builddir) && ./config.status src/include/pg_config.h
# Also remake ecpg_config.h from ecpg_config.h.in if the latter changed. Values in it can
# only change if pg_config.h has changed, so include this file to its dependencies.
$(top_builddir)/src/interfaces/ecpg/include/ecpg_config.h: $(top_builddir)/src/include/pg_config.h $(top_builddir)/src/interfaces/ecpg/include/ecpg_config.h.in $(top_builddir)/config.status
# Also remake ecpg_config.h from ecpg_config.h.in if the latter changed, same
# logic as above.
$(top_builddir)/src/interfaces/ecpg/include/ecpg_config.h: $(top_builddir)/src/interfaces/ecpg/include/stamp-h
$(top_builddir)/src/interfaces/ecpg/include/stamp-h: $(top_builddir)/src/interfaces/ecpg/include/ecpg_config.h.in $(top_builddir)/config.status
cd $(top_builddir) && ./config.status src/interfaces/ecpg/include/ecpg_config.h
# When configure changes, rerun configure with the same options as

3
src/interfaces/ecpg/include/Makefile
View File

@ -31,5 +31,4 @@ uninstall:
rm -f '$(DESTDIR)$(includedir)'/$(notdir $(ecpg_config_h))
distclean maintainer-clean:
rm -f ecpg_config.h
rm -f ecpg_config.h stamp-h