mirror of
https://github.com/postgres/postgres.git
synced 2025-11-19 13:42:17 +03:00
This commit represents a clean compile with the new templates under
FreeBSD The Makefile(s) have all been cleaned up such that there is a single LDFLAGS vs LD_ADD or LDADD or LDFLAGS or LDFLAGS_BE. The Makefile(s) should be alot more straightforward then they were before...and consistent
This commit is contained in:
@@ -7,7 +7,7 @@
|
||||
#
|
||||
#
|
||||
# IDENTIFICATION
|
||||
# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.7 1997/03/25 09:20:32 scrappy Exp $
|
||||
# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.8 1997/04/04 10:42:43 scrappy Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
@@ -46,7 +46,7 @@ ifeq ($(PORTNAME), i386_solaris)
|
||||
INSTALL-SHLIB-DEP := install-shlib
|
||||
SHLIB := libpq++.so.1
|
||||
LDFLAGS_SL = -G -z text
|
||||
CFLAGS += -fPIC
|
||||
CFLAGS += $(CFLAGS_SL)
|
||||
endif
|
||||
|
||||
all: $(LIBNAME).a $(SHLIB) install examples
|
||||
|
||||
@@ -21,13 +21,13 @@ INCLUDE_OPT= \
|
||||
-I$(HEADERDIR)
|
||||
CXXFLAGS+= $(INCLUDE_OPT)
|
||||
|
||||
LD_ADD+= -L.. -lpq++ -L$(LIBPQDIR) -lpq
|
||||
LDFLAGS+= -L.. -lpq++ -L$(LIBPQDIR) -lpq
|
||||
|
||||
#
|
||||
# And where libpq goes, so goes the authentication stuff...
|
||||
#
|
||||
ifdef KRBVERS
|
||||
LD_ADD+= $(KRBLIBS)
|
||||
LDFLAGS+= $(KRBLIBS)
|
||||
CXXFLAGS+= $(KRBFLAGS)
|
||||
endif
|
||||
|
||||
@@ -37,7 +37,7 @@ PROGS= testlibpq0 testlibpq1 testlibpq2 testlibpq3 \
|
||||
all: submake $(PROGS)
|
||||
|
||||
$(PROGS): % : %.cc ../$(LIBNAME).a
|
||||
$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $@.cc $(LD_ADD)
|
||||
$(CXX) $(CXXFLAGS) -o $@ $@.cc $(LDFLAGS)
|
||||
|
||||
.PHONY: submake
|
||||
submake:
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#
|
||||
#
|
||||
# IDENTIFICATION
|
||||
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.34 1997/04/04 02:53:14 scrappy Exp $
|
||||
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.35 1997/04/04 10:42:34 scrappy Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
@@ -40,13 +40,13 @@ ifeq ($(PORTNAME), BSD44_derived)
|
||||
install-shlib-dep := install-shlib
|
||||
shlib := libpq.so.1.0
|
||||
LDFLAGS_SL = -x -Bshareable -Bforcearchive
|
||||
CFLAGS += -fpic -DPIC
|
||||
CFLAGS += $(CFLAGS_SL)
|
||||
endif
|
||||
ifeq ($(PORTNAME), i386_solaris)
|
||||
install-shlib-dep := install-shlib
|
||||
shlib := libpq.so.1
|
||||
LDFLAGS_SL = -G -z text
|
||||
CFLAGS += -fPIC
|
||||
CFLAGS += $(CFLAGS_SL)
|
||||
endif
|
||||
|
||||
all: libpq.a $(shlib) c.h
|
||||
@@ -76,7 +76,7 @@ pqcomprim.c: ../backend/libpq/pqcomprim.c
|
||||
$(MAKE) -C ../backend fmgr.h
|
||||
|
||||
$(shlib): $(OBJS)
|
||||
$(LD) $(LDFLAGS) $(LDFLAGS_SL) -o $@ $(OBJS)
|
||||
$(LD) $(LDFLAGS_SL) -o $@ $(OBJS)
|
||||
ln -sf $@ libpq.so
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user