sharpetronics/PostgreSQL
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-07 00:02:00 -04:00
Code Issues Projects Releases Wiki Activity

Add some pg_config_path.h dependencies for places that include

Browse Source 
pg_config_paths.h outside of /src/port.
This commit is contained in:
Bruce Momjian 2004-10-12 01:04:11 +00:00
parent d10a406fe8
commit 29e7dc420a
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Makefile.shlib
View File

@ -6,7 +6,7 @@
# Copyright (c) 1998, Regents of the University of California # Copyright (c) 1998, Regents of the University of California
# #
# IDENTIFICATION # IDENTIFICATION
# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.79 2004/10/08 04:22:59 tgl Exp $ # $PostgreSQL: pgsql/src/Makefile.shlib,v 1.80 2004/10/12 01:04:09 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -245,9 +245,9 @@ endif # enable_shared
all-lib: all-static-lib all-shared-lib all-lib: all-static-lib all-shared-lib
all-static-lib: lib$(NAME).a all-static-lib: $(PTHREAD_H_WIN32) $(top_srcdir)/src/port/pg_config_paths.h lib$(NAME).a
all-shared-lib: $(shlib) all-shared-lib: $(PTHREAD_H_WIN32) $(top_srcdir)/src/port/pg_config_paths.h $(shlib)
ifneq ($(PORTNAME), cygwin) ifneq ($(PORTNAME), cygwin)
ifneq ($(PORTNAME), win32) ifneq ($(PORTNAME), win32)

7
src/interfaces/ecpg/ecpglib/Makefile
View File

@ -4,7 +4,7 @@
# #
# Copyright (c) 1994, Regents of the University of California # Copyright (c) 1994, Regents of the University of California
# #
# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.26 2004/10/04 20:36:11 momjian Exp $ # $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.27 2004/10/12 01:04:10 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -30,7 +30,7 @@ OBJS= execute.o typename.o descriptor.o data.o error.o prepare.o memory.o \
SHLIB_LINK = -L../pgtypeslib -lpgtypes $(libpq) \ SHLIB_LINK = -L../pgtypeslib -lpgtypes $(libpq) \
$(filter -lintl -lssl -lcrypto -lkrb5 -lcrypt -lm, $(LIBS)) $(PTHREAD_LIBS) $(filter -lintl -lssl -lcrypto -lkrb5 -lcrypt -lm, $(LIBS)) $(PTHREAD_LIBS)
all: all-lib all: $(top_srcdir)/src/port/pg_config_paths.h all-lib
# Shared library stuff # Shared library stuff
include $(top_srcdir)/src/Makefile.shlib include $(top_srcdir)/src/Makefile.shlib
@ -46,6 +46,9 @@ path.c: % : $(top_srcdir)/src/port/%
exec.c: % : $(top_srcdir)/src/port/% exec.c: % : $(top_srcdir)/src/port/%
rm -f $@ && $(LN_S) $< . rm -f $@ && $(LN_S) $< .
$(top_srcdir)/src/port/pg_config_paths.h:
$(MAKE) -C $(top_srcdir)/src/port pg_config_paths.h
install: all installdirs install-lib install: all installdirs install-lib
installdirs: installdirs:

15
src/interfaces/libpq/Makefile
View File

@ -4,7 +4,7 @@
# #
# Copyright (c) 1994, Regents of the University of California # Copyright (c) 1994, Regents of the University of California
# #
# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.115 2004/10/06 16:42:01 momjian Exp $ # $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.116 2004/10/12 01:04:11 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -31,13 +31,13 @@ OBJS= fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o \
$(filter crypt.o getaddrinfo.o inet_aton.o open.o snprintf.o strerror.o, $(LIBOBJS)) $(filter crypt.o getaddrinfo.o inet_aton.o open.o snprintf.o strerror.o, $(LIBOBJS))
ifeq ($(PORTNAME), win32) ifeq ($(PORTNAME), win32)
OBJS+=win32.o libpqrc.o OBJS += win32.o libpqrc.o
libpqrc.o: libpq.rc libpqrc.o : libpq.rc
windres -i libpq.rc -o libpqrc.o windres -i libpq.rc -o libpqrc.o
ifeq ($(enable_thread_safety), yes) ifeq ($(enable_thread_safety), yes)
# This doesn't work yet because configure test fails. 2004-06-19 # This doesn't work yet because configure test fails. 2004-06-19
OBJS+=pthread-win32.o OBJS += pthread-win32.o
PTHREAD_H_WIN32=yes PTHREAD_H_WIN32 = yes
endif endif
endif endif
@ -51,7 +51,7 @@ SHLIB_LINK += -lwsock32 -lws2_32 $(filter -leay32 -lssleay32, $(LIBS))
endif endif
all: $(PTHREAD_H_WIN32) all-lib all: $(PTHREAD_H_WIN32) $(top_srcdir)/src/port/pg_config_paths.h all-lib
# Shared library stuff # Shared library stuff
include $(top_srcdir)/src/Makefile.shlib include $(top_srcdir)/src/Makefile.shlib
@ -83,6 +83,9 @@ pthread.h : % : $(top_srcdir)/src/interfaces/libpq/pthread.h.win
rm -f $@ && $(LN_S) $< . rm -f $@ && $(LN_S) $< .
endif endif
$(top_srcdir)/src/port/pg_config_paths.h:
$(MAKE) -C $(top_srcdir)/src/port pg_config_paths.h
install: all installdirs install-lib install: all installdirs install-lib
$(INSTALL_DATA) $(srcdir)/libpq-fe.h $(DESTDIR)$(includedir) $(INSTALL_DATA) $(srcdir)/libpq-fe.h $(DESTDIR)$(includedir)
$(INSTALL_DATA) $(srcdir)/libpq-int.h $(DESTDIR)$(includedir_internal) $(INSTALL_DATA) $(srcdir)/libpq-int.h $(DESTDIR)$(includedir_internal)