gnustep/libs-sqlclient
0
0
Fork 0
mirror of https://github.com/gnustep/libs-sqlclient.git synced 2025-02-19 01:50:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix to get bundles to load on darwin

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/sqlclient/trunk@20434 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2004-12-10 10:50:35 +00:00
parent ef9ef50bdc
commit b147b2dd79
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Fri Dec 10 10:50:00 2004 Richard Frith-Macdonald <rfm@gnu.org>
* GNUmakefile: Remove unnecessary libraries from link commands for
bundles. On Darwin, specifying these leads to multiply defined
symbols when an executable attempts to load the bundle.
Fri Nov 19 14:40:00 2004 Richard Frith-Macdonald <rfm@gnu.org>
* WebServer.m: parse basic authentication infor and set it in extra

9
GNUmakefile
View file

@ -29,7 +29,7 @@ ifneq ($(ECPG),)
BUNDLE_NAME += ECPG
ECPG_OBJC_FILES = ECPG.m
ECPG_LIB_DIRS = -L./obj
ECPG_BUNDLE_LIBS += -lSQLClient -lgnustep-base -lobjc -lecpg
ECPG_BUNDLE_LIBS += -lecpg
ECPG_PRINCIPAL_CLASS = SQLClientECPG
TEST_TOOL_NAME += testECPG
testECPG_OBJC_FILES = testECPG.m
@ -41,19 +41,19 @@ ifneq ($(POSTGRES),)
BUNDLE_NAME += Postgres
Postgres_OBJC_FILES = Postgres.m
Postgres_LIB_DIRS = -L./obj
Postgres_BUNDLE_LIBS += -lSQLClient -lgnustep-base -lobjc -lpq
Postgres_BUNDLE_LIBS += -lpq
Postgres_PRINCIPAL_CLASS = SQLClientPostgres
TEST_TOOL_NAME += testPostgres
testPostgres_OBJC_FILES = testPostgres.m
testPostgres_LIB_DIRS += -L./obj
testPostgres_TOOL_LIBS += -lSQLClient -lpq
testPostgres_TOOL_LIBS += -lSQLClient
endif
ifneq ($(MYSQL),)
BUNDLE_NAME += MySQL
MySQL_OBJC_FILES = MySQL.m
MySQL_LIB_DIRS = -L./obj
MySQL_BUNDLE_LIBS += -lSQLClient -lgnustep-base -lobjc -lmysqlclient
MySQL_BUNDLE_LIBS += -lmysqlclient
MySQL_PRINCIPAL_CLASS = SQLClientMySQL
TEST_TOOL_NAME += testMySQL
testMySQL_OBJC_FILES = testMySQL.m
@ -67,7 +67,6 @@ Oracle_OBJC_FILES = Oracle.m
Oracle_LIB_DIRS = -L$(ORACLE_HOME)/lib -L./obj \
$(shell cat $(ORACLE_HOME)/lib/ldflags)
Oracle_BUNDLE_LIBS += -lclntsh \
-lSQLClient -lgnustep-base -lobjc \
$(shell cat $(ORACLE_HOME)/lib/sysliblist) \
-ldl -lm
Oracle_PRINCIPAL_CLASS = SQLClientOracle