mirror of
https://github.com/gnustep/libs-sqlclient.git
synced 2025-02-20 18:32:06 +00:00
Fix linking of tools to newly created libs on mingw32
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/sqlclient/trunk@22545 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
b168cfc003
commit
7444679fde
1 changed files with 18 additions and 18 deletions
36
GNUmakefile
36
GNUmakefile
|
@ -38,18 +38,18 @@ ifneq ($(ECPG),)
|
||||||
ifeq ($(APPLE),1)
|
ifeq ($(APPLE),1)
|
||||||
BUNDLE_NAME += ECPG
|
BUNDLE_NAME += ECPG
|
||||||
ECPG_OBJC_FILES = ECPG.m
|
ECPG_OBJC_FILES = ECPG.m
|
||||||
ECPG_LIB_DIRS = -L./obj
|
ECPG_LIB_DIRS = -L./$(GNUSTEP_OBJ_DIR)
|
||||||
ECPG_BUNDLE_LIBS += -lSQLClient -lecpg
|
ECPG_BUNDLE_LIBS += -lSQLClient -lecpg
|
||||||
ECPG_PRINCIPAL_CLASS = SQLClientECPG
|
ECPG_PRINCIPAL_CLASS = SQLClientECPG
|
||||||
else
|
else
|
||||||
BUNDLE_NAME += ECPG
|
BUNDLE_NAME += ECPG
|
||||||
ECPG_OBJC_FILES = ECPG.m
|
ECPG_OBJC_FILES = ECPG.m
|
||||||
ECPG_LIB_DIRS = -L./obj
|
ECPG_LIB_DIRS = -L./$(GNUSTEP_OBJ_DIR)
|
||||||
ECPG_BUNDLE_LIBS += -lecpg
|
ECPG_BUNDLE_LIBS += -lecpg
|
||||||
ECPG_PRINCIPAL_CLASS = SQLClientECPG
|
ECPG_PRINCIPAL_CLASS = SQLClientECPG
|
||||||
BUNDLE_NAME += ECPG_libs
|
BUNDLE_NAME += ECPG_libs
|
||||||
ECPG_libs_OBJC_FILES = ECPG.m
|
ECPG_libs_OBJC_FILES = ECPG.m
|
||||||
ECPG_libs_LIB_DIRS = -L./obj
|
ECPG_libs_LIB_DIRS = -L./$(GNUSTEP_OBJ_DIR)
|
||||||
ECPG_libs_BUNDLE_LIBS += -lSQLClient -lPerformance \
|
ECPG_libs_BUNDLE_LIBS += -lSQLClient -lPerformance \
|
||||||
-lgnustep-base -lobjc -lecpg
|
-lgnustep-base -lobjc -lecpg
|
||||||
ECPG_libs_PRINCIPAL_CLASS = SQLClientECPG_libs
|
ECPG_libs_PRINCIPAL_CLASS = SQLClientECPG_libs
|
||||||
|
@ -57,32 +57,32 @@ endif
|
||||||
TEST_TOOL_NAME += testECPG
|
TEST_TOOL_NAME += testECPG
|
||||||
testECPG_OBJC_FILES = testECPG.m
|
testECPG_OBJC_FILES = testECPG.m
|
||||||
testECPG_TOOL_LIBS += -lSQLClient
|
testECPG_TOOL_LIBS += -lSQLClient
|
||||||
testECPG_LIB_DIRS += -L./obj
|
testECPG_LIB_DIRS += -L./$(GNUSTEP_OBJ_DIR)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq ($(POSTGRES),)
|
ifneq ($(POSTGRES),)
|
||||||
ifeq ($(APPLE),1)
|
ifeq ($(APPLE),1)
|
||||||
BUNDLE_NAME += Postgres
|
BUNDLE_NAME += Postgres
|
||||||
Postgres_OBJC_FILES = Postgres.m
|
Postgres_OBJC_FILES = Postgres.m
|
||||||
Postgres_LIB_DIRS = -L./obj
|
Postgres_LIB_DIRS = -L./$(GNUSTEP_OBJ_DIR)
|
||||||
Postgres_BUNDLE_LIBS += -lSQLClient -lpq
|
Postgres_BUNDLE_LIBS += -lSQLClient -lpq
|
||||||
Postgres_PRINCIPAL_CLASS = SQLClientPostgres
|
Postgres_PRINCIPAL_CLASS = SQLClientPostgres
|
||||||
else
|
else
|
||||||
BUNDLE_NAME += Postgres
|
BUNDLE_NAME += Postgres
|
||||||
Postgres_OBJC_FILES = Postgres.m
|
Postgres_OBJC_FILES = Postgres.m
|
||||||
Postgres_LIB_DIRS = -L./obj
|
Postgres_LIB_DIRS = -L./$(GNUSTEP_OBJ_DIR)
|
||||||
Postgres_BUNDLE_LIBS += -lpq
|
Postgres_BUNDLE_LIBS += -lpq
|
||||||
Postgres_PRINCIPAL_CLASS = SQLClientPostgres
|
Postgres_PRINCIPAL_CLASS = SQLClientPostgres
|
||||||
BUNDLE_NAME += Postgres_libs
|
BUNDLE_NAME += Postgres_libs
|
||||||
Postgres_libs_OBJC_FILES = Postgres.m
|
Postgres_libs_OBJC_FILES = Postgres.m
|
||||||
Postgres_libs_LIB_DIRS = -L./obj
|
Postgres_libs_LIB_DIRS = -L./$(GNUSTEP_OBJ_DIR)
|
||||||
Postgres_libs_BUNDLE_LIBS += -lSQLClient -lPerformance \
|
Postgres_libs_BUNDLE_LIBS += -lSQLClient -lPerformance \
|
||||||
-lgnustep-base -lobjc -lpq
|
-lgnustep-base -lobjc -lpq
|
||||||
Postgres_libs_PRINCIPAL_CLASS = SQLClientPostgres_libs
|
Postgres_libs_PRINCIPAL_CLASS = SQLClientPostgres_libs
|
||||||
endif
|
endif
|
||||||
TEST_TOOL_NAME += testPostgres
|
TEST_TOOL_NAME += testPostgres
|
||||||
testPostgres_OBJC_FILES = testPostgres.m
|
testPostgres_OBJC_FILES = testPostgres.m
|
||||||
testPostgres_LIB_DIRS += -L./obj
|
testPostgres_LIB_DIRS += -L./$(GNUSTEP_OBJ_DIR)
|
||||||
testPostgres_TOOL_LIBS += -lSQLClient
|
testPostgres_TOOL_LIBS += -lSQLClient
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -90,25 +90,25 @@ ifneq ($(MYSQL),)
|
||||||
ifeq ($(APPLE),1)
|
ifeq ($(APPLE),1)
|
||||||
BUNDLE_NAME += MySQL
|
BUNDLE_NAME += MySQL
|
||||||
MySQL_OBJC_FILES = MySQL.m
|
MySQL_OBJC_FILES = MySQL.m
|
||||||
MySQL_LIB_DIRS = -L./obj
|
MySQL_LIB_DIRS = -L./$(GNUSTEP_OBJ_DIR)
|
||||||
MySQL_BUNDLE_LIBS += -lSQLClient -lmysqlclient
|
MySQL_BUNDLE_LIBS += -lSQLClient -lmysqlclient
|
||||||
MySQL_PRINCIPAL_CLASS = SQLClientMySQL
|
MySQL_PRINCIPAL_CLASS = SQLClientMySQL
|
||||||
else
|
else
|
||||||
BUNDLE_NAME += MySQL
|
BUNDLE_NAME += MySQL
|
||||||
MySQL_OBJC_FILES = MySQL.m
|
MySQL_OBJC_FILES = MySQL.m
|
||||||
MySQL_LIB_DIRS = -L./obj
|
MySQL_LIB_DIRS = -L./$(GNUSTEP_OBJ_DIR)
|
||||||
MySQL_BUNDLE_LIBS += -lmysqlclient
|
MySQL_BUNDLE_LIBS += -lmysqlclient
|
||||||
MySQL_PRINCIPAL_CLASS = SQLClientMySQL
|
MySQL_PRINCIPAL_CLASS = SQLClientMySQL
|
||||||
BUNDLE_NAME += MySQL_libs
|
BUNDLE_NAME += MySQL_libs
|
||||||
MySQL_libs_OBJC_FILES = MySQL.m
|
MySQL_libs_OBJC_FILES = MySQL.m
|
||||||
MySQL_libs_LIB_DIRS = -L./obj
|
MySQL_libs_LIB_DIRS = -L./$(GNUSTEP_OBJ_DIR)
|
||||||
MySQL_libs_BUNDLE_LIBS += -lSQLClient -lPerformance \
|
MySQL_libs_BUNDLE_LIBS += -lSQLClient -lPerformance \
|
||||||
-lgnustep-base -lobjc -lmysqlclient
|
-lgnustep-base -lobjc -lmysqlclient
|
||||||
MySQL_libs_PRINCIPAL_CLASS = SQLClientMySQL_libs
|
MySQL_libs_PRINCIPAL_CLASS = SQLClientMySQL_libs
|
||||||
endif
|
endif
|
||||||
TEST_TOOL_NAME += testMySQL
|
TEST_TOOL_NAME += testMySQL
|
||||||
testMySQL_OBJC_FILES = testMySQL.m
|
testMySQL_OBJC_FILES = testMySQL.m
|
||||||
testMySQL_LIB_DIRS += -L./obj
|
testMySQL_LIB_DIRS += -L./$(GNUSTEP_OBJ_DIR)
|
||||||
testMySQL_TOOL_LIBS += -lSQLClient
|
testMySQL_TOOL_LIBS += -lSQLClient
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -116,32 +116,32 @@ ifneq ($(SQLITE),)
|
||||||
ifeq ($(APPLE),1)
|
ifeq ($(APPLE),1)
|
||||||
BUNDLE_NAME += SQLite
|
BUNDLE_NAME += SQLite
|
||||||
SQLite_OBJC_FILES = SQLite.m
|
SQLite_OBJC_FILES = SQLite.m
|
||||||
SQLite_LIB_DIRS = -L./obj
|
SQLite_LIB_DIRS = -L./$(GNUSTEP_OBJ_DIR)
|
||||||
SQLite_BUNDLE_LIBS += -lSQLClient -lsqlite3
|
SQLite_BUNDLE_LIBS += -lSQLClient -lsqlite3
|
||||||
SQLite_PRINCIPAL_CLASS = SQLClientSQLite
|
SQLite_PRINCIPAL_CLASS = SQLClientSQLite
|
||||||
else
|
else
|
||||||
BUNDLE_NAME += SQLite
|
BUNDLE_NAME += SQLite
|
||||||
SQLite_OBJC_FILES = SQLite.m
|
SQLite_OBJC_FILES = SQLite.m
|
||||||
SQLite_LIB_DIRS = -L./obj
|
SQLite_LIB_DIRS = -L./$(GNUSTEP_OBJ_DIR)
|
||||||
SQLite_BUNDLE_LIBS += -lsqlite3
|
SQLite_BUNDLE_LIBS += -lsqlite3
|
||||||
SQLite_PRINCIPAL_CLASS = SQLClientSQLite
|
SQLite_PRINCIPAL_CLASS = SQLClientSQLite
|
||||||
BUNDLE_NAME += SQLite_libs
|
BUNDLE_NAME += SQLite_libs
|
||||||
SQLite_libs_OBJC_FILES = SQLite.m
|
SQLite_libs_OBJC_FILES = SQLite.m
|
||||||
SQLite_libs_LIB_DIRS = -L./obj
|
SQLite_libs_LIB_DIRS = -L./$(GNUSTEP_OBJ_DIR)
|
||||||
SQLite_libs_BUNDLE_LIBS += -lSQLClient -lPerformance \
|
SQLite_libs_BUNDLE_LIBS += -lSQLClient -lPerformance \
|
||||||
-lgnustep-base -lobjc -lsqlite3
|
-lgnustep-base -lobjc -lsqlite3
|
||||||
SQLite_libs_PRINCIPAL_CLASS = SQLClientSQLite_libs
|
SQLite_libs_PRINCIPAL_CLASS = SQLClientSQLite_libs
|
||||||
endif
|
endif
|
||||||
TEST_TOOL_NAME += testSQLite
|
TEST_TOOL_NAME += testSQLite
|
||||||
testSQLite_OBJC_FILES = testSQLite.m
|
testSQLite_OBJC_FILES = testSQLite.m
|
||||||
testSQLite_LIB_DIRS += -L./obj
|
testSQLite_LIB_DIRS += -L./$(GNUSTEP_OBJ_DIR)
|
||||||
testSQLite_TOOL_LIBS += -lSQLClient
|
testSQLite_TOOL_LIBS += -lSQLClient
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq ($(ORACLE_HOME),)
|
ifneq ($(ORACLE_HOME),)
|
||||||
BUNDLE_NAME += Oracle
|
BUNDLE_NAME += Oracle
|
||||||
Oracle_OBJC_FILES = Oracle.m
|
Oracle_OBJC_FILES = Oracle.m
|
||||||
Oracle_LIB_DIRS = -L$(ORACLE_HOME)/lib -L./obj \
|
Oracle_LIB_DIRS = -L$(ORACLE_HOME)/lib -L./$(GNUSTEP_OBJ_DIR) \
|
||||||
$(shell cat $(ORACLE_HOME)/lib/ldflags)
|
$(shell cat $(ORACLE_HOME)/lib/ldflags)
|
||||||
Oracle_BUNDLE_LIBS += -lclntsh \
|
Oracle_BUNDLE_LIBS += -lclntsh \
|
||||||
$(shell cat $(ORACLE_HOME)/lib/sysliblist) \
|
$(shell cat $(ORACLE_HOME)/lib/sysliblist) \
|
||||||
|
@ -149,7 +149,7 @@ Oracle_BUNDLE_LIBS += -lclntsh \
|
||||||
Oracle_PRINCIPAL_CLASS = SQLClientOracle
|
Oracle_PRINCIPAL_CLASS = SQLClientOracle
|
||||||
BUNDLE_NAME += Oracle_libs
|
BUNDLE_NAME += Oracle_libs
|
||||||
Oracle_libs_OBJC_FILES = Oracle.m
|
Oracle_libs_OBJC_FILES = Oracle.m
|
||||||
Oracle_libs_LIB_DIRS = -L$(ORACLE_HOME)/lib -L./obj \
|
Oracle_libs_LIB_DIRS = -L$(ORACLE_HOME)/lib -L./$(GNUSTEP_OBJ_DIR) \
|
||||||
$(shell cat $(ORACLE_HOME)/lib/ldflags)
|
$(shell cat $(ORACLE_HOME)/lib/ldflags)
|
||||||
Oracle_libs_BUNDLE_LIBS += -lclntsh \
|
Oracle_libs_BUNDLE_LIBS += -lclntsh \
|
||||||
-lSQLClient -lPerformance -lgnustep-base -lobjc \
|
-lSQLClient -lPerformance -lgnustep-base -lobjc \
|
||||||
|
|
Loading…
Reference in a new issue