diff options
author | Michele Calgaro <[email protected]> | 2018-09-17 23:20:23 +0900 |
---|---|---|
committer | Michele Calgaro <[email protected]> | 2018-09-17 23:20:23 +0900 |
commit | 3a37db01ce5bb9c77681d6b9b371e6531e4e31e4 (patch) | |
tree | 2a36a5ca5cf9107de0cd60c27f44c2e32db350fb /kmymoney2 | |
parent | e2d0de5a9ba3a913d7cc3e8ca410bece7347df13 (diff) | |
download | kmymoney-3a37db01ce5bb9c77681d6b9b371e6531e4e31e4.tar.gz kmymoney-3a37db01ce5bb9c77681d6b9b371e6531e4e31e4.zip |
LIB_QT -> LIB_TQT conversion to align to updated admin module
Signed-off-by: Michele Calgaro <[email protected]>
Diffstat (limited to 'kmymoney2')
-rw-r--r-- | kmymoney2/Makefile.am | 4 | ||||
-rw-r--r-- | kmymoney2/plugins/ofximport/Makefile.am | 2 | ||||
-rw-r--r-- | kmymoney2/widgets/Makefile.am | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/kmymoney2/Makefile.am b/kmymoney2/Makefile.am index e00baab..7650de7 100644 --- a/kmymoney2/Makefile.am +++ b/kmymoney2/Makefile.am @@ -4,7 +4,7 @@ bin_PROGRAMS = kmymoney2 kmymoney2_SOURCES = kmymoneyutils.cpp kstartuplogo.cpp kmymoney2.cpp main.cpp kmymoney2.stub kmymoney2.skel kmymoneysettings.kcfgc kmymoneyglobalsettings.cpp -kmymoney2_LDADD = $(top_builddir)/kmymoney2/views/libviews.a $(top_builddir)/kmymoney2/reports/libreports.a $(top_builddir)/kmymoney2/wizards/newuserwizard/libnewuserwizard.a $(top_builddir)/kmymoney2/wizards/newaccountwizard/libnewaccountwizard.a $(top_builddir)/kmymoney2/wizards/wizardpages/libwizardpages.a $(top_builddir)/kmymoney2/dialogs/libdialogs.a $(top_builddir)/kmymoney2/dialogs/settings/libsettings.a $(top_builddir)/kmymoney2/widgets/libwidgets.a $(top_builddir)/kmymoney2/converter/libconverter.a $(top_builddir)/kmymoney2/mymoney/storage/libstorage.a $(top_builddir)/kmymoney2/mymoney/libkmm_mymoney.la $(top_builddir)/libkgpgfile/libkgpgfile.la $(top_builddir)/kmymoney2/plugins/interfaces/libinterfaces.a $(top_builddir)/kmymoney2/plugins/libkmm_plugin.la $(top_builddir)/libkdchart/libkmm_kdchart.la dialogs/libdialogs.a $(LIB_TDEABC) $(LIB_TDEHTML) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) $(LIB_TDEUTILS) +kmymoney2_LDADD = $(top_builddir)/kmymoney2/views/libviews.a $(top_builddir)/kmymoney2/reports/libreports.a $(top_builddir)/kmymoney2/wizards/newuserwizard/libnewuserwizard.a $(top_builddir)/kmymoney2/wizards/newaccountwizard/libnewaccountwizard.a $(top_builddir)/kmymoney2/wizards/wizardpages/libwizardpages.a $(top_builddir)/kmymoney2/dialogs/libdialogs.a $(top_builddir)/kmymoney2/dialogs/settings/libsettings.a $(top_builddir)/kmymoney2/widgets/libwidgets.a $(top_builddir)/kmymoney2/converter/libconverter.a $(top_builddir)/kmymoney2/mymoney/storage/libstorage.a $(top_builddir)/kmymoney2/mymoney/libkmm_mymoney.la $(top_builddir)/libkgpgfile/libkgpgfile.la $(top_builddir)/kmymoney2/plugins/interfaces/libinterfaces.a $(top_builddir)/kmymoney2/plugins/libkmm_plugin.la $(top_builddir)/libkdchart/libkmm_kdchart.la dialogs/libdialogs.a $(LIB_TDEABC) $(LIB_TDEHTML) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT) $(LIB_TDEUTILS) SUBDIRS = mymoney widgets dialogs wizards views converter pics icons html templates plugins reports misc @@ -99,7 +99,7 @@ INCLUDES= $(all_includes) -I$(top_srcdir) -I. -I$(top_builddir)/kmymoney2/dialog METASOURCES = AUTO # the library search path. -kmymoney2_LDFLAGS = $(all_libraries) $(kde_RPATH) -export-dynamic $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEUTILS) +kmymoney2_LDFLAGS = $(all_libraries) $(kde_RPATH) -export-dynamic $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEUTILS) # Uncomment the following two lines if you add a ui.rc file for your application to make use of # KDE diff --git a/kmymoney2/plugins/ofximport/Makefile.am b/kmymoney2/plugins/ofximport/Makefile.am index 2d8ee90..32f73e8 100644 --- a/kmymoney2/plugins/ofximport/Makefile.am +++ b/kmymoney2/plugins/ofximport/Makefile.am @@ -16,7 +16,7 @@ kmm_ofximport_la_LIBADD = @OFX_LIBS@ dialogs/libdialogs.la ../libkmm_plugin.la . # LD flags for the plugin # -module says: this is a module, i.e. something you're going to dlopen # so e.g. it has no version number like a normal shared lib would have. -kmm_ofximport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_TDEHTML) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_QT) -L../.libs +kmm_ofximport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_TDEHTML) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TQT) -L../.libs # rc file containing the GUI for the plugin pluginsdir = $(kde_datadir)/kmm_ofximport diff --git a/kmymoney2/widgets/Makefile.am b/kmymoney2/widgets/Makefile.am index d6c91e9..051644d 100644 --- a/kmymoney2/widgets/Makefile.am +++ b/kmymoney2/widgets/Makefile.am @@ -67,7 +67,7 @@ kmmwidgets.cpp: $(srcdir)/kmymoney.widgets # Hence the quick hack to include the required objects from the # libkmm_mymoney.so directly into libkmymoney.so libkmymoney_la_CXXFLAGS = -U_CHECK_MEMORY -DKMM_DESIGNER -libkmymoney_la_LDFLAGS = `ls ../mymoney/*.lo` $(KDE_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) -rpath $(DESTDIR)$(qt_plugins_dir)/designer $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) +libkmymoney_la_LDFLAGS = `ls ../mymoney/*.lo` $(KDE_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) -rpath $(DESTDIR)$(qt_plugins_dir)/designer $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT) if INSTALL_QTDESIGNER_SUPPORT install-exec-local: libkmymoney.la |