diff options
Diffstat (limited to 'kexi/plugins')
-rw-r--r-- | kexi/plugins/forms/Makefile.am | 32 | ||||
-rw-r--r-- | kexi/plugins/importexport/csv/Makefile.am | 11 | ||||
-rw-r--r-- | kexi/plugins/migration/Makefile.am | 8 | ||||
-rw-r--r-- | kexi/plugins/queries/Makefile.am | 9 | ||||
-rw-r--r-- | kexi/plugins/relations/Makefile.am | 8 | ||||
-rw-r--r-- | kexi/plugins/scripting/kexiscripting/Makefile.am | 10 | ||||
-rw-r--r-- | kexi/plugins/tables/Makefile.am | 8 |
7 files changed, 57 insertions, 29 deletions
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 \ |