[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: kdebase/kdeprint
From: Stephan Kulow <coolo () kde ! org>
Date: 2003-06-26 8:50:06
[Download RAW message or body]
CVS commit by coolo:
don't link against kdeinit modules
M +1 -9 kjobviewer/Makefile.am 1.9
M +1 -1 kjobviewer/main.cpp 1.9
M +1 -8 kprinter/Makefile.am 1.7
M +1 -1 kprinter/main.cpp 1.14
--- kdebase/kdeprint/kjobviewer/Makefile.am #1.8:1.9
@@ -1,10 +1,5 @@
INCLUDES = $(all_includes)
-bin_PROGRAMS = kjobviewer
-lib_LTLIBRARIES = kjobviewer.la
-
-kjobviewer_SOURCES = dummy.cpp
-kjobviewer_LDADD = kjobviewer.la
-kjobviewer_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+kdeinit_LTLIBRARIES = kjobviewer.la
kjobviewer_la_SOURCES = kjobviewer.cpp main.cpp
@@ -21,7 +16,4 @@
xdg_apps_DATA = kjobviewer.desktop
-
-dummy.cpp:
- echo > dummy.cpp
messages: rc.cpp
--- kdebase/kdeprint/kjobviewer/main.cpp #1.8:1.9
@@ -34,5 +34,5 @@ static KCmdLineOptions options[] = {
-int main(int argc, char *argv[])
+extern "C" int kdemain(int argc, char *argv[])
{
KAboutData \
aboutData("kjobviewer","KJobViewer","0.1",I18N_NOOP("A print job \
viewer"),KAboutData::License_GPL,"(c) 2001, Michael Goffioul", 0, \
"http://printing.kde.org");
--- kdebase/kdeprint/kprinter/Makefile.am #1.6:1.7
@@ -1,10 +1,5 @@
INCLUDES = $(all_includes)
-bin_PROGRAMS = kprinter
-lib_LTLIBRARIES = kprinter.la
-
-kprinter_SOURCES = dummy.cpp
-kprinter_LDADD = kprinter.la
-kprinter_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+kdeinit_LTLIBRARIES = kprinter.la
kprinter_la_SOURCES = main.cpp printwrapper.cpp
@@ -18,4 +13,2 @@
$(XGETTEXT) *.cpp -o $(podir)/kprinter.pot
-dummy.cpp:
- echo > dummy.cpp
--- kdebase/kdeprint/kprinter/main.cpp #1.13:1.14
@@ -43,5 +43,5 @@ static KCmdLineOptions options[] =
};
-int main(int argc, char *argv[])
+extern "C" int kdemain(int argc, char *argv[])
{
KCmdLineArgs::init(argc,argv,"kprinter",I18N_NOOP("A printer tool \
for KDE" ),"0.0.1");
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic