diff options
Diffstat (limited to 'kdeprint')
-rw-r--r-- | kdeprint/Makefile.am | 14 | ||||
-rw-r--r-- | kdeprint/cups/Makefile.am | 6 | ||||
-rw-r--r-- | kdeprint/foomatic/Makefile.am | 2 | ||||
-rw-r--r-- | kdeprint/kmmanager.cpp | 4 | ||||
-rw-r--r-- | kdeprint/kxmlcommand.cpp | 2 | ||||
-rw-r--r-- | kdeprint/lpd/Makefile.am | 4 | ||||
-rw-r--r-- | kdeprint/lpr/Makefile.am | 4 | ||||
-rw-r--r-- | kdeprint/management/CMakeLists.txt | 4 | ||||
-rw-r--r-- | kdeprint/management/Makefile.am | 18 | ||||
-rw-r--r-- | kdeprint/rlpr/Makefile.am | 2 | ||||
-rw-r--r-- | kdeprint/tests/Makefile.am | 4 |
11 files changed, 32 insertions, 32 deletions
diff --git a/kdeprint/Makefile.am b/kdeprint/Makefile.am index 06f3a583c..8b63447e1 100644 --- a/kdeprint/Makefile.am +++ b/kdeprint/Makefile.am @@ -11,13 +11,13 @@ INCLUDES= -I$(top_srcdir)/kdefx -I$(top_srcdir)/kded -I$(top_srcdir) $(all_inclu kde_module_LTLIBRARIES = kded_kdeprintd.la kded_kdeprintd_la_SOURCES = kdeprintd.skel kdeprintd.cpp kprintprocess.cpp -kded_kdeprintd_la_LIBADD = $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(LIB_KDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(top_builddir)/kded/libkdeinit_kded.la +kded_kdeprintd_la_LIBADD = $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(LIB_KDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(top_builddir)/kded/libtdeinit_kded.la kded_kdeprintd_la_LDFLAGS = $(all_libraries) -module -avoid-version #kded_kdeprintd_la_METASOURCES = AUTO -lib_LTLIBRARIES = libkdeprint.la +lib_LTLIBRARIES = libtdeprint.la -libkdeprint_la_SOURCES = kmfactory.cpp kmjob.cpp kmjobmanager.cpp kmmanager.cpp kmprinter.cpp \ +libtdeprint_la_SOURCES = kmfactory.cpp kmjob.cpp kmjobmanager.cpp kmmanager.cpp kmprinter.cpp \ kmuimanager.cpp kmvirtualmanager.cpp driver.cpp driveritem.cpp droptionview.cpp \ driverview.cpp kmdbentry.cpp \ kprintpreview.cpp kprintdialog.cpp kprinter.cpp kprinterimpl.cpp kprintdialogpage.cpp \ @@ -29,10 +29,10 @@ libkdeprint_la_SOURCES = kmfactory.cpp kmjob.cpp kmjobmanager.cpp kmmanager.cpp kpmarginpage.cpp messagewindow.cpp posterpreview.cpp kpposterpage.cpp foomatic2loader.cpp \ fooparser.cpp fooscanner.cpp ppdparser.cpp ppdscanner.cpp ppdloader.cpp -libkdeprint_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-undefined -libkdeprint_la_LIBADD = $(LIBZ) $(LIB_QT) $(LIB_KDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(LIB_KFILE) -libkdeprint_la_DEPENDENCIES = $(LIB_KPARTS) -libkdeprint_la_METASOURCES = AUTO +libtdeprint_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-undefined +libtdeprint_la_LIBADD = $(LIBZ) $(LIB_QT) $(LIB_KDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(LIB_KFILE) +libtdeprint_la_DEPENDENCIES = $(LIB_KPARTS) +libtdeprint_la_METASOURCES = AUTO noinst_HEADERS = kmdbentry.h kmfactory.h \ kmuimanager.h kmvirtualmanager.h driveritem.h droptionview.h \ diff --git a/kdeprint/cups/Makefile.am b/kdeprint/cups/Makefile.am index 4e21a545e..ed45a175e 100644 --- a/kdeprint/cups/Makefile.am +++ b/kdeprint/cups/Makefile.am @@ -15,7 +15,7 @@ kdeprint_cups_la_SOURCES = cupsinfos.cpp ipprequest.cpp kmcupsfactory.cpp kmcups kptextpage.cpp kphpgl2page.cpp cupsaddsmb2.cpp kmwother.cpp ippreportdlg.cpp \ kptagspage.cpp kdeprint_cups_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kdeprint_cups_la_LIBADD = $(top_builddir)/kdeprint/management/libkdeprint_management.la $(LIB_KIO) $(LIB_CUPS) $(LIB_QT) $(LIB_KDEPRINT) $(LIB_KDECORE) $(LIB_KDEUI) +kdeprint_cups_la_LIBADD = $(top_builddir)/kdeprint/management/libtdeprint_management.la $(LIB_KIO) $(LIB_CUPS) $(LIB_QT) $(LIB_KDEPRINT) $(LIB_KDECORE) $(LIB_KDEUI) kdeprint_cups_la_METASOURCES = AUTO noinst_HEADERS = cupsinfos.h ipprequest.h kmcupsjobmanager.h kmcupsmanager.h kmcupsuimanager.h \ @@ -27,11 +27,11 @@ noinst_HEADERS = cupsinfos.h ipprequest.h kmcupsjobmanager.h kmcupsmanager.h kmc bin_PROGRAMS = make_driver_db_cups cupsdoprint make_driver_db_cups_SOURCES = make_driver_db_cups.c -make_driver_db_cups_LDADD = ../libdriverparse.a $(top_builddir)/kdecore/libkdefakes.la $(LIBDL) $(LIBZ) +make_driver_db_cups_LDADD = ../libdriverparse.a $(top_builddir)/kdecore/libtdefakes.la $(LIBDL) $(LIBZ) make_driver_db_cups_LDFLAGS = $(all_libraries) cupsdoprint_SOURCES = cupsdoprint.c -cupsdoprint_LDADD = $(LIB_CUPS) $(top_builddir)/kdecore/libkdefakes.la +cupsdoprint_LDADD = $(LIB_CUPS) $(top_builddir)/kdecore/libtdefakes.la cupsdoprint_LDFLAGS = $(all_libraries) entry_DATA = cups.print diff --git a/kdeprint/foomatic/Makefile.am b/kdeprint/foomatic/Makefile.am index 5d05859d3..a35882fbc 100644 --- a/kdeprint/foomatic/Makefile.am +++ b/kdeprint/foomatic/Makefile.am @@ -6,7 +6,7 @@ kdeprint_foomatic_la_SOURCES = kmfoomaticfactory.cpp \ kmfoomaticmanager.cpp \ kfoomaticprinterimpl.cpp kdeprint_foomatic_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kdeprint_foomatic_la_LIBADD = $(top_builddir)/kdeprint/management/libkdeprint_management.la +kdeprint_foomatic_la_LIBADD = $(top_builddir)/kdeprint/management/libtdeprint_management.la kdeprint_foomatic_la_METASOURCES = AUTO noinst_HEADERS = kmfoomaticmanager.h \ diff --git a/kdeprint/kmmanager.cpp b/kdeprint/kmmanager.cpp index 53d988a49..4fdc70f7e 100644 --- a/kdeprint/kmmanager.cpp +++ b/kdeprint/kmmanager.cpp @@ -481,7 +481,7 @@ TQStringList KMManager::detectLocalPrinters() int KMManager::addPrinterWizard(TQWidget *parent) { - KLibrary *lib = KLibLoader::self()->library("libkdeprint_management_module"); + KLibrary *lib = KLibLoader::self()->library("libtdeprint_management_module"); if (!lib) setErrorMsg(i18n("Unable to load KDE print management library: %1").arg(KLibLoader::self()->lastErrorMessage())); else @@ -497,7 +497,7 @@ int KMManager::addPrinterWizard(TQWidget *parent) bool KMManager::invokeOptionsDialog(TQWidget *parent) { - KLibrary *lib = KLibLoader::self()->library("libkdeprint_management_module"); + KLibrary *lib = KLibLoader::self()->library("libtdeprint_management_module"); if (!lib) setErrorMsg(i18n("Unable to load KDE print management library: %1").arg(KLibLoader::self()->lastErrorMessage())); else diff --git a/kdeprint/kxmlcommand.cpp b/kdeprint/kxmlcommand.cpp index 55a208d88..24c0e88df 100644 --- a/kdeprint/kxmlcommand.cpp +++ b/kdeprint/kxmlcommand.cpp @@ -655,7 +655,7 @@ TQStringList KXmlCommandManager::commandListWithDescription() TQString KXmlCommandManager::selectCommand(TQWidget *parent) { - KLibrary *lib = KLibLoader::self()->library( "libkdeprint_management_module" ); + KLibrary *lib = KLibLoader::self()->library( "libtdeprint_management_module" ); if ( !lib ) { KMessageBox::error( parent, i18n( "Unable to load KDE print management library: %1" ).arg( KLibLoader::self()->lastErrorMessage() ) ); diff --git a/kdeprint/lpd/Makefile.am b/kdeprint/lpd/Makefile.am index 41f285c3f..7230fba1b 100644 --- a/kdeprint/lpd/Makefile.am +++ b/kdeprint/lpd/Makefile.am @@ -5,14 +5,14 @@ kde_module_LTLIBRARIES = kdeprint_lpd.la kdeprint_lpd_la_SOURCES = kmlpdfactory.cpp kmlpdmanager.cpp klpdprinterimpl.cpp kmlpduimanager.cpp \ lpdtools.cpp gschecker.cpp kdeprint_lpd_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kdeprint_lpd_la_LIBADD = $(top_builddir)/kdeprint/management/libkdeprint_management.la +kdeprint_lpd_la_LIBADD = $(top_builddir)/kdeprint/management/libtdeprint_management.la kdeprint_lpd_la_METASOURCES = AUTO noinst_HEADERS = kmlpdfactory.h kmlpdmanager.h klpdprinterimpl.h kmlpduimanager.h lpdtools.h gschecker.h bin_PROGRAMS = make_driver_db_lpd make_driver_db_lpd_SOURCES = make_driver_db_lpd.c -make_driver_db_lpd_LDADD = $(top_builddir)/kdecore/libkdefakes.la +make_driver_db_lpd_LDADD = $(top_builddir)/kdecore/libtdefakes.la entry_DATA = lpd.print entrydir = $(kde_datadir)/kdeprint/plugins diff --git a/kdeprint/lpr/Makefile.am b/kdeprint/lpr/Makefile.am index 29944f348..cb40661f9 100644 --- a/kdeprint/lpr/Makefile.am +++ b/kdeprint/lpr/Makefile.am @@ -13,7 +13,7 @@ kdeprint_lpr_la_SOURCES = printcapreader.cpp lprhandler.cpp \ lprngtoolhandler.cpp \ editentrydialog.cpp kdeprint_lpr_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kdeprint_lpr_la_LIBADD = $(top_builddir)/kdeprint/management/libkdeprint_management.la \ +kdeprint_lpr_la_LIBADD = $(top_builddir)/kdeprint/management/libtdeprint_management.la \ $(LIB_QT) $(LIB_KDEPRINT) $(LIB_KDEUI) $(LIB_KDECORE) kdeprint_lpr_la_METASOURCES = AUTO @@ -31,7 +31,7 @@ kdeprintlprdir = $(includedir)/kdeprint/lpr bin_PROGRAMS = make_driver_db_lpr make_driver_db_lpr_SOURCES = make_driver_db_lpr.c make_driver_db_lpr_LDFLAGS = $(all_libraries) -make_driver_db_lpr_LDADD = $(top_builddir)/kdecore/libkdefakes.la ../libdriverparse.a $(LIBDL) +make_driver_db_lpr_LDADD = $(top_builddir)/kdecore/libtdefakes.la ../libdriverparse.a $(LIBDL) entry_DATA = lpr.print entrydir = $(kde_datadir)/kdeprint/plugins diff --git a/kdeprint/management/CMakeLists.txt b/kdeprint/management/CMakeLists.txt index 8c4fb42ba..c9fe6a5a9 100644 --- a/kdeprint/management/CMakeLists.txt +++ b/kdeprint/management/CMakeLists.txt @@ -82,9 +82,9 @@ tde_add_library( ${target} SHARED AUTOMOC ) -#### libkdeprint_management_module ############## +#### libtdeprint_management_module ############## -set( target libkdeprint_management_module ) +set( target libtdeprint_management_module ) set( ${target}_SRCS kdeprint_management_module.cpp diff --git a/kdeprint/management/Makefile.am b/kdeprint/management/Makefile.am index 42bdeba4d..0cc693b68 100644 --- a/kdeprint/management/Makefile.am +++ b/kdeprint/management/Makefile.am @@ -2,8 +2,8 @@ AM_CPPFLAGS = -D_KDEPRINT_COMPILE INCLUDES= -I$(top_srcdir)/kdefx -I$(top_srcdir)/kdeprint -I$(top_builddir)/kdeprint -I$(top_srcdir)/kio -I$(top_srcdir)/kfile -I$(top_srcdir) $(all_includes) -lib_LTLIBRARIES = libkdeprint_management.la -kde_module_LTLIBRARIES = libkdeprint_management_module.la +lib_LTLIBRARIES = libtdeprint_management.la +kde_module_LTLIBRARIES = libtdeprint_management_module.la kdeinit_LTLIBRARIES = kaddprinterwizard.la bin_PROGRAMS = @@ -11,7 +11,7 @@ kaddprinterwizard_la_SOURCES = kaddprinterwizard.cpp kaddprinterwizard_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEPRINT) $(LIB_KDEUI) kaddprinterwizard_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH) -libkdeprint_management_la_SOURCES = \ +libtdeprint_management_la_SOURCES = \ kmdbcreator.cpp kmdriverdb.cpp kmdriverdbwidget.cpp \ kmiconview.cpp kminfopage.cpp kmmainview.cpp \ kmpages.cpp kmprinterview.cpp kmjobviewer.cpp \ @@ -25,13 +25,13 @@ libkdeprint_management_la_SOURCES = \ kmwlocal.cpp kiconselectaction.cpp kmconfigpreview.cpp sidepixmap.cpp \ pluginaction.cpp kxmlcommanddlg.cpp kxmlcommandselector.cpp kmconfigcommand.cpp \ kmconfigfilter.cpp kmconfigfonts.cpp kmconfigjobs.cpp networkscanner.cpp -libkdeprint_management_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-undefined -libkdeprint_management_la_LIBADD = ../libkdeprint.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) -libkdeprint_management_la_METASOURCES = AUTO +libtdeprint_management_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-undefined +libtdeprint_management_la_LIBADD = ../libtdeprint.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) +libtdeprint_management_la_METASOURCES = AUTO -libkdeprint_management_module_la_SOURCES = kdeprint_management_module.cpp -libkdeprint_management_module_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined -libkdeprint_management_module_la_LIBADD = libkdeprint_management.la $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE) +libtdeprint_management_module_la_SOURCES = kdeprint_management_module.cpp +libtdeprint_management_module_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined +libtdeprint_management_module_la_LIBADD = libtdeprint_management.la $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE) kdeprint_HEADERS = kmmainview.h kmjobviewer.h kmprinterpage.h kiconselectaction.h kmtimer.h kdeprintdir = $(includedir)/kdeprint diff --git a/kdeprint/rlpr/Makefile.am b/kdeprint/rlpr/Makefile.am index d0ea535ec..2a42d106f 100644 --- a/kdeprint/rlpr/Makefile.am +++ b/kdeprint/rlpr/Makefile.am @@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = kdeprint_rlpr.la kdeprint_rlpr_la_SOURCES = kmrlprfactory.cpp kmrlprmanager.cpp krlprprinterimpl.cpp kmrlpruimanager.cpp \ kmwrlpr.cpp kmproprlpr.cpp kmproxywidget.cpp kmconfigproxy.cpp kdeprint_rlpr_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kdeprint_rlpr_la_LIBADD = $(top_builddir)/kdeprint/management/libkdeprint_management.la $(LIB_QT) $(LIB_KDEPRINT) $(LIB_KDECORE) $(LIB_KDEUI) +kdeprint_rlpr_la_LIBADD = $(top_builddir)/kdeprint/management/libtdeprint_management.la $(LIB_QT) $(LIB_KDEPRINT) $(LIB_KDECORE) $(LIB_KDEUI) kdeprint_rlpr_la_METASOURCES = AUTO noinst_HEADERS = kmrlprmanager.h krlprprinterimpl.h kmrlpruimanager.h kmwrlpr.h kmproprlpr.h \ diff --git a/kdeprint/tests/Makefile.am b/kdeprint/tests/Makefile.am index e27cad3db..7a2d1865c 100644 --- a/kdeprint/tests/Makefile.am +++ b/kdeprint/tests/Makefile.am @@ -4,12 +4,12 @@ check_PROGRAMS = helpviewer drawdemo helpviewer_SOURCES = helpwindow.cpp main.cpp richpage.cpp helpviewer_METASOURCES = helpwindow.moc -helpviewer_LDADD = $(top_builddir)/kdeprint/libkdeprint.la +helpviewer_LDADD = $(top_builddir)/kdeprint/libtdeprint.la helpviewer_LDFLAGS = $(all_libraries) drawdemo_SOURCES = drawdemo.cpp drawdemo_METASOURCES = drawdemo.moc -drawdemo_LDADD = $(top_builddir)/kdeprint/libkdeprint.la +drawdemo_LDADD = $(top_builddir)/kdeprint/libtdeprint.la drawdemo_LDFLAGS = $(all_libraries) EXTRA_DIST = home.xpm back.xpm forward.xpm |