diff options
Diffstat (limited to 'tdeprint/cups')
| -rw-r--r-- | tdeprint/cups/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tdeprint/cups/Makefile.am | 4 | ||||
| -rw-r--r-- | tdeprint/cups/cupsdconf2/Makefile.am | 2 | ||||
| -rw-r--r-- | tdeprint/cups/cupsdconf2/cupsddialog.cpp | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/tdeprint/cups/CMakeLists.txt b/tdeprint/cups/CMakeLists.txt index 2166cc08f..62c48618c 100644 --- a/tdeprint/cups/CMakeLists.txt +++ b/tdeprint/cups/CMakeLists.txt @@ -12,7 +12,7 @@ add_subdirectory( cupsdconf2 ) add_definitions( - -D_KDEPRINT_COMPILE + -D_TDEPRINT_COMPILE ) include_directories( diff --git a/tdeprint/cups/Makefile.am b/tdeprint/cups/Makefile.am index 6f3d7edec..64e8b997d 100644 --- a/tdeprint/cups/Makefile.am +++ b/tdeprint/cups/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -D_KDEPRINT_COMPILE +AM_CPPFLAGS = -D_TDEPRINT_COMPILE SUBDIRS = cupsdconf2 @@ -15,7 +15,7 @@ tdeprint_cups_la_SOURCES = cupsinfos.cpp ipprequest.cpp kmcupsfactory.cpp kmcups kptextpage.cpp kphpgl2page.cpp cupsaddsmb2.cpp kmwother.cpp ippreportdlg.cpp \ kptagspage.cpp tdeprint_cups_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -tdeprint_cups_la_LIBADD = $(top_builddir)/tdeprint/management/libtdeprint_management.la $(LIB_KIO) $(LIB_CUPS) $(LIB_QT) $(LIB_KDEPRINT) $(LIB_KDECORE) $(LIB_KDEUI) +tdeprint_cups_la_LIBADD = $(top_builddir)/tdeprint/management/libtdeprint_management.la $(LIB_KIO) $(LIB_CUPS) $(LIB_QT) $(LIB_TDEPRINT) $(LIB_TDECORE) $(LIB_TDEUI) tdeprint_cups_la_METASOURCES = AUTO noinst_HEADERS = cupsinfos.h ipprequest.h kmcupsjobmanager.h kmcupsmanager.h kmcupsuimanager.h \ diff --git a/tdeprint/cups/cupsdconf2/Makefile.am b/tdeprint/cups/cupsdconf2/Makefile.am index 434af6a3c..eb7e42159 100644 --- a/tdeprint/cups/cupsdconf2/Makefile.am +++ b/tdeprint/cups/cupsdconf2/Makefile.am @@ -15,7 +15,7 @@ cupsdconf_la_SOURCES = cupsdconf.cpp cupsddialog.cpp cupsdpage.cpp cupsdcomment. qdirmultilineedit.cpp sizewidget.cpp main.cpp cupsdconf_la_METASOURCES = AUTO cupsdconf_la_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_RPATH) -cupsdconf_la_LIBADD = $(LIB_KIO) $(LIB_CUPS) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE) +cupsdconf_la_LIBADD = $(LIB_KIO) $(LIB_CUPS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) noinst_HEADERS = cupsdconf.h cupsdpage.h cupsddialog.h cupsdcomment.h cupsdsplash.h \ cupsdserverpage.h cupsdlogpage.h cupsdjobspage.h cupsdfilterpage.h \ diff --git a/tdeprint/cups/cupsdconf2/cupsddialog.cpp b/tdeprint/cups/cupsdconf2/cupsddialog.cpp index e6338eb8c..bc91f9ffe 100644 --- a/tdeprint/cups/cupsdconf2/cupsddialog.cpp +++ b/tdeprint/cups/cupsdconf2/cupsddialog.cpp @@ -55,11 +55,11 @@ static TQString pass_string; extern "C" { #include "cups-util.h" - KDEPRINT_EXPORT bool restartServer(TQString& msg) + TDEPRINT_EXPORT bool restartServer(TQString& msg) { return CupsdDialog::restartServer(msg); } - KDEPRINT_EXPORT bool configureServer(TQWidget *parent, TQString& msg) + TDEPRINT_EXPORT bool configureServer(TQWidget *parent, TQString& msg) { dynamically_loaded = true; bool result = CupsdDialog::configure(TQString::null, parent, &msg); |