Browse Source

LIB_QT -> LIB_TQT conversion to align to updated admin module

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
bug/266/move-to-usr
Michele Calgaro 4 years ago
parent
commit
50f8377bee
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
  1. 2
      dcopjava/binding/Makefile.am
  2. 4
      dcopjava/dcopidl2java/Makefile.am
  3. 2
      dcoppython/shell/Makefile.am
  4. 2
      dcoppython/test/dcopserver/Makefile.am
  5. 6
      kjsembed/Makefile.am
  6. 2
      kjsembed/bindings/Makefile.am
  7. 4
      kjsembed/builtins/Makefile.am
  8. 2
      kjsembed/cpptests/jsaccess/Makefile.am
  9. 2
      kjsembed/docs/embedding/simple-embed/Makefile.am
  10. 2
      kjsembed/plugin/Makefile.am
  11. 18
      kjsembed/plugins/Makefile.am
  12. 2
      kjsembed/qtbindings/Makefile.am
  13. 2
      kjsembed/tdescript/Makefile.am
  14. 2
      korundum/rubylib/rbtdeconfig_compiler/Makefile.am
  15. 4
      qtjava/javalib/qtjava/Makefile.am
  16. 2
      qtruby/bin/Makefile.am
  17. 2
      qtruby/rubylib/designer/rbuic/Makefile.am
  18. 2
      qtruby/rubylib/designer/uilib/Makefile.am
  19. 2
      qtruby/rubylib/qtruby/Makefile.am
  20. 2
      qtsharp/src/libqtsharp/Makefile.am
  21. 2
      smoke/tde/Makefile.am
  22. 2
      smoke/tde/qtguess.pl.in
  23. 2
      smoke/tqt/Makefile.am
  24. 2
      smoke/tqt/qtguess.pl.in
  25. 2
      tdejava/koala/Makefile.am
  26. 2
      xparts/src/tde/Makefile.am
  27. 4
      xparts/xpart_notepad/Makefile.am

2
dcopjava/binding/Makefile.am

@ -1,7 +1,7 @@
lib_LTLIBRARIES = libjavadcop.la
libjavadcop_la_SOURCES = client.cpp
libjavadcop_la_LDFLAGS = $(KDE_LDFLAGS) $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx
libjavadcop_la_LDFLAGS = $(KDE_LDFLAGS) $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx
libjavadcop_la_LIBADD = $(LIB_TDECORE)
INCLUDES = $(jni_includes) $(all_includes)

4
dcopjava/dcopidl2java/Makefile.am

@ -6,6 +6,6 @@ bin_PROGRAMS = dcopidl2java
dcopidl2java_SOURCES = main.cpp skel.cpp stubimpl.cpp
noinst_HEADERS = main.h
dcopidl2java_LDADD = $(LIB_QT)
dcopidl2java_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
dcopidl2java_LDADD = $(LIB_TQT)
dcopidl2java_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

2
dcoppython/shell/Makefile.am

@ -17,7 +17,7 @@ pythlibdir = $(PYTHONMODDIR)/site-packages
pcop_la_SOURCES = pcop.cpp marshaller.cpp importedmodules.cpp
pcop_la_LDFLAGS = $(all_libraries) -module -avoid-version
pcop_la_LIBADD = -lDCOP -ltdecore $(LIB_QT) $(LIBPYTHON)
pcop_la_LIBADD = -lDCOP -ltdecore $(LIB_TQT) $(LIBPYTHON)
noinst_HEADERS = pcop.h marshaller.h marshal_funcs.h importedmodules.h

2
dcoppython/test/dcopserver/Makefile.am

@ -21,7 +21,7 @@ bin_PROGRAMS = tdedcoptest
# the application source, library search path, and link libraries
tdedcoptest_SOURCES = main.cpp tdedcoptest.cpp tdedcoptest_iface.skel mainclass.cpp
tdedcoptest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
tdedcoptest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
tdedcoptest_LDADD = $(LIB_TDEUI)
# this is where the desktop file will go

6
kjsembed/Makefile.am

@ -48,17 +48,17 @@ kjsembedinclude_HEADERS = jsconsolewidget.h \
jsbindingplugin.h \
global.h
libkjsembed_la_LDFLAGS = -no-undefined -version-info 1:0 $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_KJS)
libkjsembed_la_LDFLAGS = -no-undefined -version-info 1:0 $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_KJS)
libkjsembed_la_LIBADD = bindings/libkjsembedbindings.la \
builtins/libkjsembedbuiltins.la \
qtbindings/libkjsembedqtbindings.la \
-ltqui \
$(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) \
$(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) \
$(LIB_TDEFILE) $(LIB_TDEHTML) -lkjs $(LIBSOCKET)
kjscmd_SOURCES = kjscmd.cpp
kjscmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_KJS)
kjscmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_KJS)
kjscmd_LDADD = libkjsembed.la
man_MANS = kjscmd.1

2
kjsembed/bindings/Makefile.am

@ -21,7 +21,7 @@ libkjsembedbindings_la_SOURCES = image_imp.cpp \
size_imp.cpp
libkjsembedbindings_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
libkjsembedbindings_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) \
libkjsembedbindings_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) \
$(LIB_TDEFILE) $(LIBSOCKET)
libkjsembedbindings_la_METASOURCES = AUTO

4
kjsembed/builtins/Makefile.am

@ -11,8 +11,8 @@ libkjsembedbuiltins_la_SOURCES = stdaction_imp.cpp \
qdir_imp.cpp \
qfile_imp.cpp
libkjsembedbuiltins_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
libkjsembedbuiltins_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) \
libkjsembedbuiltins_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
libkjsembedbuiltins_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) \
$(LIB_TDEFILE) -lkjs $(LIBSOCKET)
libkjsembedbuiltins_la_METASOURCES = AUTO

2
kjsembed/cpptests/jsaccess/Makefile.am

@ -8,7 +8,7 @@ INCLUDES += -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST
noinst_PROGRAMS = jsaccess
jsaccess_SOURCES = jsaccess.cpp
jsaccess_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_KJS)
jsaccess_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_KJS)
jsaccess_LDADD = $(top_builddir)/kjsembed/libkjsembed.la
METASOURCES = AUTO

2
kjsembed/docs/embedding/simple-embed/Makefile.am

@ -8,7 +8,7 @@ bin_PROGRAMS = embedjs
INCLUDES = -I$(top_srcdir) $(all_includes)
# the library search path.
embedjs_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
embedjs_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
# the libraries to link against.
embedjs_LDADD = $(LIB_TDEFILE) $(LIB_TDEPRINT) -lkjs $(top_builddir)/kjsembed/libkjsembed.la

2
kjsembed/plugin/Makefile.am

@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = libjsconsoleplugin.la
METASOURCES = AUTO
libjsconsoleplugin_la_SOURCES = jsconsoleplugin.cpp
libjsconsoleplugin_la_LIBADD = -lDCOP -ltdecore -ltdeui -lkjs $(LIB_QT) $(LIB_TDEPARTS) ../libkjsembed.la
libjsconsoleplugin_la_LIBADD = -lDCOP -ltdecore -ltdeui -lkjs $(LIB_TQT) $(LIB_TDEPARTS) ../libkjsembed.la
libjsconsoleplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH)
#pluginsdir = $(kde_datadir)/konqueror/kpartplugins

18
kjsembed/plugins/Makefile.am

@ -7,27 +7,27 @@ METASOURCES = AUTO
# the Plugin's source, library search path, and link libraries
libcustomobjectplugin_la_SOURCES = customobject_plugin.cpp
libcustomobjectplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx $(KDE_RPATH) $(all_libraries)
libcustomobjectplugin_la_LIBADD = $(LIB_QT) $(LIB_TDEPARTS) $(LIB_TDECORE) $(LIB_TDEFILE) ../libkjsembed.la
libcustomobjectplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx $(KDE_RPATH) $(all_libraries)
libcustomobjectplugin_la_LIBADD = $(LIB_TQT) $(LIB_TDEPARTS) $(LIB_TDECORE) $(LIB_TDEFILE) ../libkjsembed.la
# the Plugin's source, library search path, and link libraries
libcustomqobjectplugin_la_SOURCES = customqobject_plugin.cpp
libcustomqobjectplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx $(KDE_RPATH) $(all_libraries)
libcustomqobjectplugin_la_LIBADD = $(LIB_QT) $(LIB_TDEPARTS) $(LIB_TDECORE) $(LIB_TDEFILE) ../libkjsembed.la
libcustomqobjectplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx $(KDE_RPATH) $(all_libraries)
libcustomqobjectplugin_la_LIBADD = $(LIB_TQT) $(LIB_TDEPARTS) $(LIB_TDECORE) $(LIB_TDEFILE) ../libkjsembed.la
# the Plugin's source, library search path, and link libraries
libimagefxplugin_la_SOURCES = imagefx_plugin.cpp
libimagefxplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx $(KDE_RPATH) $(all_libraries)
libimagefxplugin_la_LIBADD = $(LIB_QT) $(LIB_TDEPARTS) $(LIB_TDECORE) $(LIB_TDEFILE) ../libkjsembed.la
libimagefxplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx $(KDE_RPATH) $(all_libraries)
libimagefxplugin_la_LIBADD = $(LIB_TQT) $(LIB_TDEPARTS) $(LIB_TDECORE) $(LIB_TDEFILE) ../libkjsembed.la
# the Plugin's source, library search path, and link libraries
libqprocessplugin_la_SOURCES = qprocess_plugin.cpp
libqprocessplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx $(KDE_RPATH) $(all_libraries)
libqprocessplugin_la_LIBADD = $(LIB_QT) $(LIB_TDEPARTS) $(LIB_TDECORE) $(LIB_TDEFILE) ../libkjsembed.la
libqprocessplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx $(KDE_RPATH) $(all_libraries)
libqprocessplugin_la_LIBADD = $(LIB_TQT) $(LIB_TDEPARTS) $(LIB_TDECORE) $(LIB_TDEFILE) ../libkjsembed.la
# the Plugin's source, library search path, and link libraries
libfileitemplugin_la_SOURCES = tdefileitemloader.cpp
libfileitemplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx $(all_libraries)
libfileitemplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx $(all_libraries)
libfileitemplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEFILE) ../libkjsembed.la

2
kjsembed/qtbindings/Makefile.am

@ -28,7 +28,7 @@ libkjsembedqtbindings_la_SOURCES = qlistviewitem_imp.cpp \
qmenuitem_imp.cpp
libkjsembedqtbindings_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
libkjsembedqtbindings_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
libkjsembedqtbindings_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI)
libkjsembedqtbindings_la_METASOURCES = AUTO

2
kjsembed/tdescript/Makefile.am

@ -3,7 +3,7 @@ INCLUDES = -I$(srcdir) -I$(top_srcdir) $(all_includes)
kde_module_LTLIBRARIES = libjavascript.la
libjavascript_la_SOURCES = javascript.cpp
libjavascript_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -no-undefined -avoid-version
libjavascript_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -no-undefined -avoid-version
libjavascript_la_LIBADD = -ltdescript ../libkjsembed.la

2
korundum/rubylib/rbtdeconfig_compiler/Makefile.am

@ -12,7 +12,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir) $(all_includes)
bin_PROGRAMS = rbtdeconfig_compiler
rbtdeconfig_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
rbtdeconfig_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
rbtdeconfig_compiler_LDADD = $(LIB_TDECORE)
rbtdeconfig_compiler_SOURCES = rbtdeconfig_compiler.cpp

4
qtjava/javalib/qtjava/Makefile.am

@ -30,8 +30,8 @@ noinst_HEADERS = QtSupport.h JavaSlot.h QtUtils.h
libqtjavasupport_la_SOURCES = JavaSlot.cpp QtSupport.cpp QtUtils.cpp
libqtjavasupport_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0:0
libqtjavasupport_la_LIBADD = $(LIB_QT)
libqtjavasupport_la_LIBADD = $(LIB_TQT)
libqtjava_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0:0
libqtjava_la_LIBADD = $(LIB_QT) libqtjavasupport.la
libqtjava_la_LIBADD = $(LIB_TQT) libqtjavasupport.la

2
qtruby/bin/Makefile.am

@ -4,6 +4,6 @@ bin_PROGRAMS = qtrubyinit
qtrubyinit_LDFLAGS = -module $(all_libraries) -version-info 0:0:0 -L$(top_srcdir)/smoke/tqt/ -L$(RUBY_LIBDIR)
qtrubyinit_METASOURCES = AUTO
qtrubyinit_SOURCES = qtrubyinit.cpp
qtrubyinit_LDADD = $(LIB_QT) $(RUBY_LIBRUBYARG) $(top_builddir)/smoke/tqt/libsmoketqt.la $(top_builddir)/qtruby/rubylib/qtruby/libqtrubyinternal.la
qtrubyinit_LDADD = $(LIB_TQT) $(RUBY_LIBRUBYARG) $(top_builddir)/smoke/tqt/libsmoketqt.la $(top_builddir)/qtruby/rubylib/qtruby/libqtrubyinternal.la
bin_SCRIPTS = rbqtapi rbqtsh

2
qtruby/rubylib/designer/rbuic/Makefile.am

@ -9,7 +9,7 @@ INCLUDES = $(all_includes)
METASOURCES = AUTO
librbuic_la_SOURCES = widgetdatabase.cpp uic.cpp subclassing.cpp parser.cpp object.cpp form.cpp embed.cpp domtool.cpp
librbuic_la_LIBADD = $(LIB_QT) $(LIBZ)
librbuic_la_LIBADD = $(LIB_TQT) $(LIBZ)
rbuic_SOURCES = main.cpp
rbuic_LDADD = librbuic.la $(all_libraries)

2
qtruby/rubylib/designer/uilib/Makefile.am

@ -4,4 +4,4 @@ rubylibdir = $(RUBY_ARCHDIR)
rubylib_LTLIBRARIES = tqui.la
tqui_la_SOURCES = tqui.cpp
tqui_la_LDFLAGS = -module -export-dynamic $(all_libraries) -version-info 0:0:0
tqui_la_LIBADD = -ltqui $(LIB_QT) $(RUBY_LIBRUBYARG) $(top_builddir)/smoke/tqt/libsmoketqt.la $(top_builddir)/qtruby/rubylib/qtruby/libqtrubyinternal.la
tqui_la_LIBADD = -ltqui $(LIB_TQT) $(RUBY_LIBRUBYARG) $(top_builddir)/smoke/tqt/libsmoketqt.la $(top_builddir)/qtruby/rubylib/qtruby/libqtrubyinternal.la

2
qtruby/rubylib/qtruby/Makefile.am

@ -10,6 +10,6 @@ rubylibdir = $(RUBY_ARCHDIR)
rubylib_LTLIBRARIES = qtruby.la
qtruby_la_SOURCES =
qtruby_la_LDFLAGS = -module $(all_libraries) -version-info 0:0:0
qtruby_la_LIBADD = libqtrubyinternal.la $(LIB_QT) $(top_builddir)/smoke/tqt/libsmoketqt.la $(LIB_TDECORE) $(RUBY_LIBRUBYARG) -lstdc++
qtruby_la_LIBADD = libqtrubyinternal.la $(LIB_TQT) $(top_builddir)/smoke/tqt/libsmoketqt.la $(LIB_TDECORE) $(RUBY_LIBRUBYARG) -lstdc++
SUBDIRS = lib

2
qtsharp/src/libqtsharp/Makefile.am

@ -2,7 +2,7 @@
lib_LTLIBRARIES = libqtsharp.la
libqtsharp_la_SOURCES = customslot.cpp qtsharp.cpp
libqtsharp_la_LDFLAGS = $(QT_LDFLAGS) $(LIB_QT) -no-undefined -version-info 0:0:0 $(all_libraries) ../../../qtc/clib/qtc/libqtc.la
libqtsharp_la_LDFLAGS = $(QT_LDFLAGS) $(LIB_TQT) -no-undefined -version-info 0:0:0 $(all_libraries) ../../../qtc/clib/qtc/libqtc.la
KDE_OPTIONS = qtonly

2
smoke/tde/Makefile.am

@ -9,7 +9,7 @@ EXTRA_DIST=generate.pl.in qtguess.pl.in qt_smoke.h Makefile.am
libsmoketde_la_LDFLAGS = -version-info 3:2:2 -no-undefined $(all_libraries) $(GLINC) $(KDE_RPATH)
# the libraries to link against.
libsmoketde_la_LIBADD = $(LIB_TDEHTML) -lkjs -lfontconfig $(LIB_KMDI) $(LIB_KNS) $(LIB_TDESPELL) $(LIB_TDEUTILS) $(LIB_TDEPRINT) $(GLLIB) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEPARTS) -lDCOP -ltdefx -ltdenewstuff -ltdemdi
libsmoketde_la_LIBADD = $(LIB_TDEHTML) -lkjs -lfontconfig $(LIB_KMDI) $(LIB_KNS) $(LIB_TDESPELL) $(LIB_TDEUTILS) $(LIB_TDEPRINT) $(GLLIB) $(LIB_TQT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEPARTS) -lDCOP -ltdefx -ltdenewstuff -ltdemdi
x_sources = x_1.cpp x_2.cpp x_3.cpp x_4.cpp x_5.cpp x_6.cpp x_7.cpp \
x_8.cpp x_9.cpp x_10.cpp x_11.cpp x_12.cpp x_13.cpp x_14.cpp x_15.cpp \

2
smoke/tde/qtguess.pl.in

@ -38,7 +38,7 @@ my $tmp = gettmpfile();
my $qtinc = '@qt_includes@';
my $allinc = '@all_includes@';
my $alllib = '@all_libraries@';
my $qtflags ='@LIB_QT@';
my $qtflags ='@LIB_TQT@';
my %x;
$x{'LIBPNG'} = '@LIBPNG@';
$x{'LIBJPEG'} = '@LIBJPEG@';

2
smoke/tqt/Makefile.am

@ -9,7 +9,7 @@ EXTRA_DIST=generate.pl.in qtguess.pl.in qt_smoke.h Makefile.am
libsmoketqt_la_LDFLAGS = -version-info 3:2:2 -no-undefined $(all_libraries) $(GLINC)
# the libraries to link against.
libsmoketqt_la_LIBADD = $(LIB_QT) $(GLLIB) $(LIBTQSCINTILLA)
libsmoketqt_la_LIBADD = $(LIB_TQT) $(GLLIB) $(LIBTQSCINTILLA)
x_sources = x_1.cpp x_2.cpp x_3.cpp x_4.cpp x_5.cpp x_6.cpp x_7.cpp \
x_8.cpp x_9.cpp x_10.cpp x_11.cpp x_12.cpp x_13.cpp x_14.cpp x_15.cpp \

2
smoke/tqt/qtguess.pl.in

@ -38,7 +38,7 @@ my $tmp = gettmpfile();
my $qtinc = '@qt_includes@';
my $allinc = '@all_includes@';
my $alllib = '@all_libraries@';
my $qtflags ='@LIB_QT@';
my $qtflags ='@LIB_TQT@';
my %x;
$x{'LIBPNG'} = '@LIBPNG@';
$x{'LIBJPEG'} = '@LIBJPEG@';

2
tdejava/koala/Makefile.am

@ -36,7 +36,7 @@ INCLUDES= $(all_includes)
koala_METASOURCES = AUTO
# the library search path.
koala_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
koala_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
# them while "make clean", use CLEANFILES
CLEANFILES = koala.jar

2
xparts/src/tde/Makefile.am

@ -5,7 +5,7 @@ lib_LTLIBRARIES = libtdexparts.la
libtdexparts_la_SOURCES = xparthost_kpart.cpp xparthost.skel xpart.stub \
kbrowsersignals.cpp xbrowsersignals.skel xbrowserextension.stub
libtdexparts_la_LIBADD = $(LIB_TDEPARTS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -lDCOP
libtdexparts_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) -lDCOP
libtdexparts_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0
xpart_DIR=$(srcdir)/../interfaces

4
xparts/xpart_notepad/Makefile.am

@ -8,12 +8,12 @@ xpart_DIR=$(srcdir)/../src/interfaces
xparthost_DIR=$(srcdir)/../src/interfaces
xp_notepad_SOURCES = xp_notepad.cpp xpart.skel xparthost.stub
xp_notepad_LDADD = $(LIB_QT) $(LIB_TDECORE) -lDCOP ../src/tde/libtdexparts.la
xp_notepad_LDADD = $(LIB_TQT) $(LIB_TDECORE) -lDCOP ../src/tde/libtdexparts.la
#xp_notepad_LDFLAGS = -L$(prefix)/lib -lxpcom $(all_libraries)
xp_notepad_LDFLAGS = -L$(prefix)/lib $(all_libraries)
shell_xparthost_SOURCES = shell_xparthost.cpp
shell_xparthost_LDADD = $(LIB_QT) $(LIB_TDECORE) -lDCOP $(LIB_TDEUI) $(LIB_TDEPARTS) $(top_builddir)/xparts/src/tde/libtdexparts.la
shell_xparthost_LDADD = $(LIB_TQT) $(LIB_TDECORE) -lDCOP $(LIB_TDEUI) $(LIB_TDEPARTS) $(top_builddir)/xparts/src/tde/libtdexparts.la
shell_xparthost_LDFLAGS = $(all_libraries)
lib_LTLIBRARIES = libxp_notepadpart.la

Loading…
Cancel
Save