summaryrefslogtreecommitdiffstats
path: root/kexi
diff options
context:
space:
mode:
Diffstat (limited to 'kexi')
-rw-r--r--kexi/formeditor/factories/Makefile.am10
-rw-r--r--kexi/kexidb/drivers/mySQL/Makefile.am4
-rw-r--r--kexi/kexidb/drivers/pqxx/Makefile.am4
-rw-r--r--kexi/kexidb/drivers/sqlite/Makefile.am7
-rw-r--r--kexi/kexidb/drivers/sqlite2/Makefile.am7
-rw-r--r--kexi/migration/mysql/Makefile.am6
-rw-r--r--kexi/migration/pqxx/Makefile.am6
-rw-r--r--kexi/plugins/forms/Makefile.am32
-rw-r--r--kexi/plugins/importexport/csv/Makefile.am11
-rw-r--r--kexi/plugins/migration/Makefile.am8
-rw-r--r--kexi/plugins/queries/Makefile.am9
-rw-r--r--kexi/plugins/relations/Makefile.am8
-rw-r--r--kexi/plugins/scripting/kexiscripting/Makefile.am10
-rw-r--r--kexi/plugins/tables/Makefile.am8
-rw-r--r--kexi/tests/newapi/Makefile.am5
15 files changed, 86 insertions, 49 deletions
diff --git a/kexi/formeditor/factories/Makefile.am b/kexi/formeditor/factories/Makefile.am
index 72571e4c..dd87e8bb 100644
--- a/kexi/formeditor/factories/Makefile.am
+++ b/kexi/formeditor/factories/Makefile.am
@@ -4,13 +4,15 @@ INCLUDES = -I$(top_srcdir)/kexi -I$(top_srcdir)/kexi/formeditor \
-I$(top_srcdir)/kexi/core \
-I$(top_srcdir)/lib -I$(top_srcdir)/lib/koproperty -I$(top_srcdir)/lib/kofficecore $(all_includes)
kde_module_LTLIBRARIES = kformdesigner_containers.la kformdesigner_stdwidgets.la
-kformdesigner_containers_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../lib/koproperty/.libs/ -lkoproperty
+kformdesigner_containers_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
kformdesigner_containers_la_SOURCES = containerfactory.cpp
-kformdesigner_containers_la_LIBADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la
+kformdesigner_containers_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/kexi/formeditor/libkformdesigner.la \
+ ../../../lib/koproperty/libkoproperty.la
-kformdesigner_stdwidgets_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../lib/koproperty/.libs/ -lkoproperty
+kformdesigner_stdwidgets_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
kformdesigner_stdwidgets_la_SOURCES = stdwidgetfactory.cpp
-kformdesigner_stdwidgets_la_LIBADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la
+kformdesigner_stdwidgets_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/kexi/formeditor/libkformdesigner.la \
+ ../../../lib/koproperty/libkoproperty.la
servicesdir=$(kde_servicesdir)/kformdesigner
diff --git a/kexi/kexidb/drivers/mySQL/Makefile.am b/kexi/kexidb/drivers/mySQL/Makefile.am
index 2892bedb..1678d52b 100644
--- a/kexi/kexidb/drivers/mySQL/Makefile.am
+++ b/kexi/kexidb/drivers/mySQL/Makefile.am
@@ -16,13 +16,13 @@ kexidb_mysqldriver_la_SOURCES = \
mysqlkeywords.cpp \
mysqlpreparedstatement.cpp
-kexidb_mysqldriver_la_LIBADD = $(LIB_KPARTS) \
+kexidb_mysqldriver_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KPARTS) \
$(LIB_QT) \
$(MYSQL_LIBS) \
-lmysqlclient \
../../libkexidb.la
-kexidb_mysqldriver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../../lib/kofficecore/.libs/ -lkofficecore -L../../../../lib/kofficeui/.libs/ -lkofficeui -L../../../../lib/store/.libs/ -lkstore
+kexidb_mysqldriver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
kde_services_DATA = kexidb_mysqldriver.desktop
diff --git a/kexi/kexidb/drivers/pqxx/Makefile.am b/kexi/kexidb/drivers/pqxx/Makefile.am
index 03dccbcd..38fef647 100644
--- a/kexi/kexidb/drivers/pqxx/Makefile.am
+++ b/kexi/kexidb/drivers/pqxx/Makefile.am
@@ -9,11 +9,11 @@ kexidb_pqxxsqldriver_la_METASOURCES = AUTO
kexidb_pqxxsqldriver_la_SOURCES = pqxxdriver.cpp pqxxcursor.cpp pqxxconnection.cpp \
pqxxkeywords.cpp pqxxconnection_p.cpp pqxxpreparedstatement.cpp
-kexidb_pqxxsqldriver_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) -lpqxx ../../libkexidb.la
+kexidb_pqxxsqldriver_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KPARTS) $(LIB_QT) -lpqxx ../../libkexidb.la
kexidb_pqxxsqldriver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) \
-L$(PQXX_LIBDIR) -L$(PG_LIBDIR) $(VER_INFO) -no-undefined \
- -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../../lib/kofficecore/.libs/ -lkofficecore -L../../../../lib/kofficeui/.libs/ -lkofficeui -L../../../../lib/store/.libs/ -lkstore
+ -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
kde_services_DATA = kexidb_pqxxsqldriver.desktop
diff --git a/kexi/kexidb/drivers/sqlite/Makefile.am b/kexi/kexidb/drivers/sqlite/Makefile.am
index 9d124bc7..2722ea1c 100644
--- a/kexi/kexidb/drivers/sqlite/Makefile.am
+++ b/kexi/kexidb/drivers/sqlite/Makefile.am
@@ -11,12 +11,13 @@ kexidb_sqlite3driver_la_SOURCES = sqliteconnection.cpp sqlitedriver.cpp sqlitecu
sqlitekeywords.cpp sqlitepreparedstatement.cpp sqlitevacuum.cpp sqliteadmin.cpp \
sqlitealter.cpp
-kexidb_sqlite3driver_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) \
+kexidb_sqlite3driver_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KPARTS) $(LIB_QT) \
$(top_builddir)/kexi/3rdparty/kexisql3/src/libkexisql3.la \
$(top_builddir)/kexi/kexidb/libkexidb.la \
- $(top_builddir)/kexi/kexidb/parser/libkexidbparser.la
+ $(top_builddir)/kexi/kexidb/parser/libkexidbparser.la \
+ ../../../../kexi/kexiutils/libkexiutils.la
-kexidb_sqlite3driver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../../lib/kofficecore/.libs/ -lkofficecore -L../../../../lib/kofficeui/.libs/ -lkofficeui -L../../../../lib/store/.libs/ -lkstore -L../../../../kexi/kexiutils/.libs/ -lkexiutils
+kexidb_sqlite3driver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
kde_services_DATA = kexidb_sqlite3driver.desktop
diff --git a/kexi/kexidb/drivers/sqlite2/Makefile.am b/kexi/kexidb/drivers/sqlite2/Makefile.am
index bd07f282..7484a278 100644
--- a/kexi/kexidb/drivers/sqlite2/Makefile.am
+++ b/kexi/kexidb/drivers/sqlite2/Makefile.am
@@ -15,12 +15,13 @@ kexidb_sqlite2driver_la_METASOURCES = AUTO
kexidb_sqlite2driver_la_SOURCES = sqliteconnection.cpp sqlitedriver.cpp sqlitecursor.cpp \
sqlitepreparedstatement.cpp sqliteadmin.cpp sqlitealter.cpp
-kexidb_sqlite2driver_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) \
+kexidb_sqlite2driver_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KPARTS) $(LIB_QT) \
$(top_builddir)/kexi/3rdparty/kexisql/src/libkexisql2.la \
$(top_builddir)/kexi/kexidb/libkexidb.la \
- $(top_builddir)/kexi/kexidb/parser/libkexidbparser.la
+ $(top_builddir)/kexi/kexidb/parser/libkexidbparser.la \
+ ../../../../kexi/kexiutils/libkexiutils.la
-kexidb_sqlite2driver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../../lib/kofficecore/.libs/ -lkofficecore -L../../../../lib/kofficeui/.libs/ -lkofficeui -L../../../../lib/store/.libs/ -lkstore -L../../../../kexi/kexiutils/.libs/ -lkexiutils
+kexidb_sqlite2driver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
kde_services_DATA = kexidb_sqlite2driver.desktop
diff --git a/kexi/migration/mysql/Makefile.am b/kexi/migration/mysql/Makefile.am
index 94239311..63b96268 100644
--- a/kexi/migration/mysql/Makefile.am
+++ b/kexi/migration/mysql/Makefile.am
@@ -8,9 +8,11 @@ keximigrate_mysql_la_METASOURCES = AUTO
keximigrate_mysql_la_SOURCES = mysqlmigrate.cpp
-keximigrate_mysql_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) ../libkeximigrate.la $(MYSQL_LIBS) -lmysqlclient
+keximigrate_mysql_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KPARTS) $(LIB_QT) ../libkeximigrate.la $(MYSQL_LIBS) -lmysqlclient \
+ ../../../kexi/kexidb/libkexidb.la \
+ ../../../kexi/kexiutils/libkexiutils.la
-keximigrate_mysql_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../kexi/kexidb/.libs/ -lkexidb -L../../../kexi/kexiutils/.libs/ -lkexiutils
+keximigrate_mysql_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
kde_services_DATA = keximigrate_mysql.desktop
diff --git a/kexi/migration/pqxx/Makefile.am b/kexi/migration/pqxx/Makefile.am
index 8405de9f..bdf76305 100644
--- a/kexi/migration/pqxx/Makefile.am
+++ b/kexi/migration/pqxx/Makefile.am
@@ -10,9 +10,11 @@ keximigrate_pqxx_la_SOURCES = pqxxmigrate.cpp
#TODO share -libs with pqxx kexidb drv!
#keximigrate_pqxx_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) -lcom_err -lkrb5 -lssl -lcrypto -lcrypt -lpqxx ../libkeximigrate.la
-keximigrate_pqxx_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) -lpqxx ../libkeximigrate.la
+keximigrate_pqxx_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KPARTS) $(LIB_QT) -lpqxx ../libkeximigrate.la \
+ ../../../kexi/kexidb/libkexidb.la \
+ ../../../kexi/kexiutils/libkexiutils.la
-keximigrate_pqxx_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -L$(PQXX_LIBDIR) -L$(PG_LIBDIR) $(VER_INFO) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../kexi/kexidb/.libs/ -lkexidb -L../../../kexi/kexiutils/.libs/ -lkexiutils
+keximigrate_pqxx_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -L$(PQXX_LIBDIR) -L$(PG_LIBDIR) $(VER_INFO) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
kde_services_DATA = keximigrate_pqxx.desktop
diff --git a/kexi/plugins/forms/Makefile.am b/kexi/plugins/forms/Makefile.am
index 2cc9688f..7d6d0777 100644
--- a/kexi/plugins/forms/Makefile.am
+++ b/kexi/plugins/forms/Makefile.am
@@ -4,31 +4,45 @@ kde_module_LTLIBRARIES = kexihandler_form.la kformdesigner_kexidbwidgets.la
kexihandler_form_la_SOURCES = kexiforms.cpp
-kexihandler_form_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../kexi/kexidb/.libs/ -lkexidb -L../../../kexi/kexiutils/.libs/ -lkexiutils -L../../../kexi/widget/.libs/ -lkexiextendedwidgets -L../../../kexi/widget/utils/.libs/ -lkexiguiutils
-kexihandler_form_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \
+kexihandler_form_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+kexihandler_form_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/kexi/core/libkexicore.la \
$(top_builddir)/kexi/widget/utils/libkexiguiutils.la \
$(top_builddir)/kexi/widget/tableview/libkexidatatable.la \
$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
$(top_builddir)/kexi/formeditor/libkformdesigner.la \
$(top_builddir)/lib/koproperty/libkoproperty.la \
- ./libkexiformutils.la
+ ./libkexiformutils.la \
+ ../../../kexi/kexidb/libkexidb.la \
+ ../../../kexi/kexiutils/libkexiutils.la \
+ ../../../kexi/widget/libkexiextendedwidgets.la \
+ ../../../kexi/widget/utils/libkexiguiutils.la
-kformdesigner_kexidbwidgets_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../kexi/kexidb/.libs/ -lkexidb -L../../../kexi/kexiutils/.libs/ -lkexiutils -L../../../kexi/widget/.libs/ -lkexiextendedwidgets -L../../../kexi/widget/utils/.libs/ -lkexiguiutils
+
+kformdesigner_kexidbwidgets_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
kformdesigner_kexidbwidgets_la_SOURCES = kexidbfactory.cpp
-kformdesigner_kexidbwidgets_la_LIBADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la \
+kformdesigner_kexidbwidgets_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/kexi/formeditor/libkformdesigner.la \
$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
- ./libkexiformutils.la
+ ./libkexiformutils.la \
+ ../../../kexi/kexidb/libkexidb.la \
+ ../../../kexi/kexiutils/libkexiutils.la \
+ ../../../kexi/widget/libkexiextendedwidgets.la \
+ ../../../kexi/widget/utils/libkexiguiutils.la
+
lib_LTLIBRARIES = libkexiformutils.la
libkexiformutils_la_SOURCES = kexiformdataiteminterface.cpp kexidataawarewidgetinfo.cpp \
kexidataprovider.cpp kexiformscrollview.cpp kexiformeventhandler.cpp \
kexidbtextwidgetinterface.cpp kexiactionselectiondialog.cpp kexiformmanager.cpp \
kexidatasourcepage.cpp kexiformpart.cpp kexiformview.cpp
-libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../kexi/kexidb/.libs/ -lkexidb -L../../../kexi/kexiutils/.libs/ -lkexiutils -L../../../kexi/widget/.libs/ -lkexiextendedwidgets -L../../../kexi/widget/utils/.libs/ -lkexiguiutils
-libkexiformutils_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \
+libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+libkexiformutils_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/kexi/core/libkexicore.la \
$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
$(top_builddir)/kexi/formeditor/libkformdesigner.la \
- $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la
+ $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la \
+ ../../../kexi/kexidb/libkexidb.la \
+ ../../../kexi/kexiutils/libkexiutils.la \
+ ../../../kexi/widget/libkexiextendedwidgets.la \
+ ../../../kexi/widget/utils/libkexiguiutils.la
kformdesignerservicesdir=$(kde_servicesdir)/kformdesigner
kformdesignerservices_DATA=kformdesigner_kexidbfactory.desktop
diff --git a/kexi/plugins/importexport/csv/Makefile.am b/kexi/plugins/importexport/csv/Makefile.am
index 5249d93a..dba9018b 100644
--- a/kexi/plugins/importexport/csv/Makefile.am
+++ b/kexi/plugins/importexport/csv/Makefile.am
@@ -5,10 +5,13 @@ kde_module_LTLIBRARIES = kexihandler_csv_importexport.la
kexihandler_csv_importexport_la_SOURCES = kexicsv_importexportpart.cpp kexicsvimportdialog.cpp \
kexicsvimportoptionsdlg.cpp kexicsvwidgets.cpp kexicsvexport.cpp kexicsvexportwizard.cpp
-kexihandler_csv_importexport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../../lib/kofficecore/.libs/ -lkofficecore -L../../../../lib/kofficeui/.libs/ -lkofficeui -L../../../../lib/store/.libs/ -lkstore -L../../../../kexi/kexidb/.libs/ -lkexidb -L../../../../kexi/kexiutils/.libs/ -lkexiutils \
- -L../../../../kexi/main/.libs/ -lkeximain -L../../../../kexi/widget/.libs/ -lkexiextendedwidgets
-kexihandler_csv_importexport_la_LIBADD = ../../../core/libkexicore.la \
- ../../../migration/libkeximigrate.la
+kexihandler_csv_importexport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+kexihandler_csv_importexport_la_LIBADD = $(KOFFICE_LIBS) ../../../core/libkexicore.la \
+ ../../../migration/libkeximigrate.la \
+ ../../../../kexi/kexidb/libkexidb.la \
+ ../../../../kexi/kexiutils/libkexiutils.la \
+ ../../../../kexi/main/libkeximain.la \
+ ../../../../kexi/widget/libkexiextendedwidgets.la
INCLUDES= -I$(top_srcdir)/kexi/core -I$(top_srcdir)/kexi \
-I$(top_srcdir)/kexi/widget -I$(top_srcdir)/kexi/migration \
diff --git a/kexi/plugins/migration/Makefile.am b/kexi/plugins/migration/Makefile.am
index 3c15d375..2d92873d 100644
--- a/kexi/plugins/migration/Makefile.am
+++ b/kexi/plugins/migration/Makefile.am
@@ -4,9 +4,11 @@ kde_module_LTLIBRARIES = kexihandler_migration.la
kexihandler_migration_la_SOURCES = keximigrationpart.cpp
-kexihandler_migration_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../kexi/kexidb/.libs/ -lkexidb -L../../../kexi/kexiutils/.libs/ -lkexiutils
-kexihandler_migration_la_LIBADD = ../../core/libkexicore.la \
- ../../migration/libkeximigrate.la
+kexihandler_migration_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+kexihandler_migration_la_LIBADD = $(KOFFICE_LIBS) ../../core/libkexicore.la \
+ ../../migration/libkeximigrate.la \
+ ../../../kexi/kexidb/libkexidb.la \
+ ../../../kexi/kexiutils/libkexiutils.la
INCLUDES= -I$(top_srcdir)/kexi/core -I$(top_srcdir)/kexi \
-I$(top_srcdir)/kexi/widget -I$(top_srcdir)/kexi/migration \
diff --git a/kexi/plugins/queries/Makefile.am b/kexi/plugins/queries/Makefile.am
index 1b1052de..5dbb14f6 100644
--- a/kexi/plugins/queries/Makefile.am
+++ b/kexi/plugins/queries/Makefile.am
@@ -5,13 +5,16 @@ kde_module_LTLIBRARIES = kexihandler_query.la
kexihandler_query_la_SOURCES = kexiquerypart.cpp kexiquerydesignersql.cpp \
kexiquerydesignersqlhistory.cpp kexiquerydesignerguieditor.cpp \
kexiqueryview.cpp
-kexihandler_query_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../kexi/kexidb/.libs/ -lkexidb -L../../../kexi/kexiutils/.libs/ -lkexiutils -L../../../kexi/kexidb/parser/.libs/ -lkexidbparser
-kexihandler_query_la_LIBADD = ../../core/libkexicore.la \
+kexihandler_query_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+kexihandler_query_la_LIBADD = $(KOFFICE_LIBS) ../../core/libkexicore.la \
$(top_builddir)/kexi/kexidb/libkexidb.la \
$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
$(top_builddir)/kexi/widget/tableview/libkexidatatable.la \
$(top_builddir)/kexi/widget/relations/libkexirelationsview.la \
- $(top_builddir)/lib/koproperty/libkoproperty.la
+ $(top_builddir)/lib/koproperty/libkoproperty.la \
+ ../../../kexi/kexidb/libkexidb.la \
+ ../../../kexi/kexiutils/libkexiutils.la \
+ ../../../kexi/kexidb/parser/libkexidbparser.la
INCLUDES= -I$(top_srcdir)/kexi/core -I$(top_srcdir)/kexi \
-I$(top_srcdir)/kexi/widget -I$(top_srcdir)/kexi/widget/tableview \
diff --git a/kexi/plugins/relations/Makefile.am b/kexi/plugins/relations/Makefile.am
index 47a263a5..779b47e3 100644
--- a/kexi/plugins/relations/Makefile.am
+++ b/kexi/plugins/relations/Makefile.am
@@ -8,9 +8,11 @@ kde_module_LTLIBRARIES = kexihandler_relation.la
kexihandler_relation_la_SOURCES = kexirelationpartimpl.cpp \
kexirelationmaindlg.cpp
-kexihandler_relation_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../kexi/kexidb/.libs/ -lkexidb -L../../../kexi/kexiutils/.libs/ -lkexiutils
-kexihandler_relation_la_LIBADD = ../../core/libkexicore.la \
- ../../widget/relations/libkexirelationsview.la
+kexihandler_relation_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+kexihandler_relation_la_LIBADD = $(KOFFICE_LIBS) ../../core/libkexicore.la \
+ ../../widget/relations/libkexirelationsview.la \
+ ../../../kexi/kexidb/libkexidb.la \
+ ../../../kexi/kexiutils/libkexiutils.la
INCLUDES= -I$(top_srcdir)/kexi/core -I$(top_srcdir)/kexi \
-I$(top_srcdir)/kexi/widget -I$(top_srcdir)/kexi/widget/relations \
diff --git a/kexi/plugins/scripting/kexiscripting/Makefile.am b/kexi/plugins/scripting/kexiscripting/Makefile.am
index e9d0889b..6b857e74 100644
--- a/kexi/plugins/scripting/kexiscripting/Makefile.am
+++ b/kexi/plugins/scripting/kexiscripting/Makefile.am
@@ -7,14 +7,16 @@ kexihandler_script_la_SOURCES = \
kexihandler_script_la_LDFLAGS = \
$(KDE_PLUGIN) -module -no-undefined -Wnounresolved $(all_libraries) $(VER_INFO) \
- -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../../lib/kofficecore/.libs/ -lkofficecore -L../../../../lib/kofficeui/.libs/ -lkofficeui -L../../../../lib/store/.libs/ -lkstore -L../../../../kexi/kexidb/.libs/ -lkexidb -L../../../../kexi/kexiutils/.libs/ -lkexiutils \
- -L../../../../lib/kross/api/.libs/ -lkrossapi
+ -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
-kexihandler_script_la_LIBADD = \
+kexihandler_script_la_LIBADD = $(KOFFICE_LIBS) \
$(top_builddir)/lib/kross/main/libkrossmain.la \
$(top_builddir)/kexi/core/libkexicore.la \
$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
- $(top_builddir)/lib/koproperty/libkoproperty.la
+ $(top_builddir)/lib/koproperty/libkoproperty.la \
+ ../../../../kexi/kexidb/libkexidb.la \
+ ../../../../kexi/kexiutils/libkexiutils.la \
+ ../../../../lib/kross/api/libkrossapi.la
INCLUDES = \
$(KOFFICE_INCLUDES) \
diff --git a/kexi/plugins/tables/Makefile.am b/kexi/plugins/tables/Makefile.am
index 2ee5a4ab..eb388397 100644
--- a/kexi/plugins/tables/Makefile.am
+++ b/kexi/plugins/tables/Makefile.am
@@ -5,12 +5,14 @@ kde_module_LTLIBRARIES = kexihandler_table.la
kexihandler_table_la_SOURCES = kexitablepart.cpp kexitabledesignerview.cpp kexitabledesignerview_p.cpp \
kexitabledesigner_dataview.cpp kexitabledesignercommands.cpp kexilookupcolumnpage.cpp
-kexihandler_table_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../kexi/kexidb/.libs/ -lkexidb -L../../../kexi/kexiutils/.libs/ -lkexiutils -lkmdi
-kexihandler_table_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \
+kexihandler_table_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -lkmdi
+kexihandler_table_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/kexi/core/libkexicore.la \
$(top_builddir)/kexi/kexidb/libkexidb.la \
$(top_builddir)/kexi/widget/tableview/libkexidatatable.la \
$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
- $(top_builddir)/lib/koproperty/libkoproperty.la
+ $(top_builddir)/lib/koproperty/libkoproperty.la \
+ ../../../kexi/kexidb/libkexidb.la \
+ ../../../kexi/kexiutils/libkexiutils.la
INCLUDES= $(KOFFICE_INCLUDES) \
-I$(top_srcdir)/kexi/core -I$(top_srcdir)/kexi \
diff --git a/kexi/tests/newapi/Makefile.am b/kexi/tests/newapi/Makefile.am
index 940e7c16..85eeab32 100644
--- a/kexi/tests/newapi/Makefile.am
+++ b/kexi/tests/newapi/Makefile.am
@@ -18,8 +18,9 @@ METASOURCES = AUTO
kexidbtest_SOURCES = main.cpp
kexidbtest_LDADD = $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la \
../../kexidb/parser/libkexidbparser.la \
- $(top_builddir)/kexi/widget/libkexiextendedwidgets.la
-kexidbtest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -L../../widget/tableview/.libs/ -lkexidatatable
+ $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
+ ../../widget/tableview/libkexidatatable.la
+kexidbtest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
#kexidbmysqlcursor_SOURCES = mysqlcursor.cpp
#kexidbmysqlcursor_LDADD = $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la \
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-15 17:52:55 +0000