--- kdesdk-3.5.5/kapptemplate/kapp/app-Makefile.am 2005-09-10 04:20:59.000000000 -0400 +++ kdesdk-3.5.5-new/kapptemplate/kapp/app-Makefile.am 2006-10-30 11:35:10.000000000 -0500 @@ -8,28 +8,30 @@ # this is the program that gets installed. it's name is used for all # of the other Makefile.am variables -bin_PROGRAMS = $APP_NAME_LC ${APP_NAME_LC}_client +bin_PROGRAMS = +lib_LTLIBRARIES = +kdeinit_LTLIBRARIES = ${APP_NAME_LC}.la ${APP_NAME_LC}_client.la # set the include path for X, qt and KDE INCLUDES = \$(all_includes) # the library search path. -${APP_NAME_LC}_LDFLAGS = \$(KDE_RPATH) \$(all_libraries) +${APP_NAME_LC}_la_LDFLAGS = \$(KDE_PLUGIN) -module \$(all_libraries) # the libraries to link against. -${APP_NAME_LC}_LDADD = \$(LIB_KFILE) -lkdeprint +${APP_NAME_LC}_la_LIBADD = \$(LIB_KFILE) -lkdeprint # which sources should be compiled for $APP_NAME_LC -${APP_NAME_LC}_SOURCES = main.cpp ${APP_NAME_LC}.cpp ${APP_NAME_LC}view.cpp \\ +${APP_NAME_LC}_la_SOURCES = main.cpp ${APP_NAME_LC}.cpp ${APP_NAME_LC}view.cpp \\ ${APP_NAME_LC}pref.cpp ${APP_NAME_LC}iface.skel # these are the headers for your project noinst_HEADERS = ${APP_NAME_LC}.h ${APP_NAME_LC}view.h ${APP_NAME_LC}pref.h # client stuff -${APP_NAME_LC}_client_LDFLAGS = \$(KDE_RPATH) \$(all_libraries) -${APP_NAME_LC}_client_LDADD = \$(LIB_KDECORE) -${APP_NAME_LC}_client_SOURCES = ${APP_NAME_LC}_client.cpp +${APP_NAME_LC}_client_la_LDFLAGS = \$(KDE_PLUGIN) -module \$(all_libraries) +${APP_NAME_LC}_client_la_LIBADD = \$(LIB_KDECORE) +${APP_NAME_LC}_client_la_SOURCES = ${APP_NAME_LC}_client.cpp # let automoc handle all of the meta source files (moc) METASOURCES = AUTO --- kdesdk-3.5.5/kapptemplate/kapp/app_client.cpp 2005-09-10 04:20:59.000000000 -0400 +++ kdesdk-3.5.5-new/kapptemplate/kapp/app_client.cpp 2006-10-30 11:35:10.000000000 -0500 @@ -5,7 +5,7 @@ #include #include -int main(int argc, char **argv) +extern "C" KDE_EXPORT int kdemain(int argc, char **argv) { KApplication app(argc, argv, "${APP_NAME_LC}_client", false); --- kdesdk-3.5.5/kapptemplate/kapp/main.cpp 2005-09-10 04:20:59.000000000 -0400 +++ kdesdk-3.5.5-new/kapptemplate/kapp/main.cpp 2006-10-30 11:35:10.000000000 -0500 @@ -18,7 +18,7 @@ KCmdLineLastOption }; -int main(int argc, char **argv) +extern "C" KDE_EXPORT int kdemain(int argc, char **argv) { KAboutData about("${APP_NAME_LC}", I18N_NOOP("${APP_NAME}"), version, description, KAboutData::License_GPL, "(C) 2004 ${AUTHOR}", 0, 0, "${EMAIL}"); about.addAuthor( "${AUTHOR}", 0, "${EMAIL}" ); --- kdesdk-3.5.5/kapptemplate/kpartapp/main.cpp 2005-09-10 04:20:59.000000000 -0400 +++ kdesdk-3.5.5-new/kapptemplate/kpartapp/main.cpp 2006-10-30 11:35:10.000000000 -0500 @@ -17,7 +17,7 @@ KCmdLineLastOption }; -int main(int argc, char **argv) +extern "C" KDE_EXPORT int kdemain(int argc, char **argv) { KAboutData about("${APP_NAME_LC}", I18N_NOOP("${APP_NAME}"), version, description, KAboutData::License_GPL, "(C) 2004 ${AUTHOR}", 0, 0, "${EMAIL}"); about.addAuthor( "${AUTHOR}", 0, "${EMAIL}" ); --- kdesdk-3.5.5/kbabel/catalogmanager/Makefile.am 2006-10-01 13:27:34.000000000 -0400 +++ kdesdk-3.5.5-new/kbabel/catalogmanager/Makefile.am 2006-10-30 11:35:10.000000000 -0500 @@ -7,7 +7,11 @@ # this is the program that gets installed. Its name is used for all # of the other Makefile.am variables noinst_LTLIBRARIES = libcatalogmanager.la -bin_PROGRAMS = catalogmanager + +kdeinit_LTLIBRARIES = catalogmanager.la +bin_PROGRAMS = +lib_LTLIBRARIES = + # set the include path for X, qt and KDE. Let $(all_includes) be always last. INCLUDES = -I$(srcdir)/../common -I../common -I$(srcdir)/../kbabeldict \ @@ -30,11 +34,11 @@ libcatalogmanager_la_LDFLAGS = $(all_libraries) -no-undefined -catalogmanager_SOURCES = main.cpp +catalogmanager_la_SOURCES = main.cpp # the libraries to link against. -catalogmanager_LDADD = libcatalogmanager.la -catalogmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH) +catalogmanager_la_LIBADD = libcatalogmanager.la +catalogmanager_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module # these are the headers for your project noinst_HEADERS = catalogmanageriface.h catalogmanager.h \ --- kdesdk-3.5.5/kbabel/catalogmanager/main.cpp 2006-07-22 04:11:51.000000000 -0400 +++ kdesdk-3.5.5-new/kbabel/catalogmanager/main.cpp 2006-10-30 11:35:10.000000000 -0500 @@ -178,7 +178,7 @@ }; -int main(int argc, char **argv) +extern "C" KDE_EXPORT int kdemain(int argc, char **argv) { KLocale::setMainCatalogue("kbabel"); KAboutData about("catalogmanager",I18N_NOOP("KBabel - Catalog Manager"),VERSION, --- kdesdk-3.5.5/kbabel/commonui/Makefile.am 2006-10-01 13:27:34.000000000 -0400 +++ kdesdk-3.5.5-new/kbabel/commonui/Makefile.am 2006-10-30 11:35:10.000000000 -0500 @@ -2,7 +2,7 @@ # this is the program that gets installed. it's name is used for all # of the other Makefile.am variables -noinst_LTLIBRARIES = libkbabelcommonui.la +lib_LTLIBRARIES = libkbabelcommonui.la # set the include path for X, qt and KDE. Put local paths before all_includes. INCLUDES = -I$(srcdir)/../common -I../common -I$(srcdir)/../kbabeldict -I../kbabeldict $(all_includes) --- kdesdk-3.5.5/kbabel/kbabel/Makefile.am 2006-10-01 13:27:33.000000000 -0400 +++ kdesdk-3.5.5-new/kbabel/kbabel/Makefile.am 2006-10-30 11:35:10.000000000 -0500 @@ -5,7 +5,9 @@ # this is the program that gets installed. it's name is used for all # of the other Makefile.am variables noinst_LTLIBRARIES = libkbabel.la -bin_PROGRAMS = kbabel +kdeinit_LTLIBRARIES = kbabel.la +bin_PROGRAMS = +lib_LTLIBRARIES = # set the include path for X, qt and KDE INCLUDES = -I$(srcdir)/../common -I../common -I$(srcdir)/../commonui -I../commonui -I$(srcdir)/../kbabeldict -I../kbabeldict $(all_includes) @@ -41,11 +43,11 @@ libkbabel_la_LDFLAGS = $(all_libraries) -kbabel_SOURCES = main.cpp +kbabel_la_SOURCES = main.cpp # the libraries to link against. -kbabel_LDADD = libkbabel.la -kbabel_LDFLAGS = $(all_libraries) $(KDE_RPATH) +kbabel_la_LIBADD = libkbabel.la +kbabel_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module # these are the headers for your project noinst_HEADERS = kbabel.h kbabelview.h \ --- kdesdk-3.5.5/kbabel/kbabel/main.cpp 2006-07-22 04:11:50.000000000 -0400 +++ kdesdk-3.5.5-new/kbabel/kbabel/main.cpp 2006-10-30 11:35:10.000000000 -0500 @@ -506,7 +506,7 @@ }; -int main(int argc, char **argv) +extern "C" KDE_EXPORT int kdemain(int argc, char **argv) { KAboutData about("kbabel",I18N_NOOP("KBabel"),VERSION, I18N_NOOP("An advanced PO file editor"),KAboutData::License_GPL, --- kdesdk-3.5.5/kbabel/kbabeldict/Makefile.am 2006-10-01 13:27:33.000000000 -0400 +++ kdesdk-3.5.5-new/kbabel/kbabeldict/Makefile.am 2006-10-30 11:35:10.000000000 -0500 @@ -6,17 +6,15 @@ pkgincludedir = $(includedir)/kbabel -# this is the program that gets installed. it's name is used for all -# of the other Makefile.am variables -noinst_LTLIBRARIES = libkbabeldict.la -bin_PROGRAMS = kbabeldict +bin_PROGRAMS = +kdeinit_LTLIBRARIES = kbabeldict.la # set the include path for X, qt and KDE INCLUDES = -I$(srcdir)/../common -I$(top_builddir)/kbabel/common $(all_includes) # library for babeldict plugins -lib_LTLIBRARIES = libkbabeldictplugin.la +lib_LTLIBRARIES = libkbabeldictplugin.la libkbabeldict.la libkbabeldictplugin_la_SOURCES = searchengine.cpp libkbabeldictplugin_la_LIBADD = $(LIB_KDECORE) libkbabeldictplugin_la_LDFLAGS = -version-info 3:0:2 $(all_libraries) @@ -28,11 +26,11 @@ libkbabeldict_la_LDFLAGS = $(all_libraries) -no-undefined -kbabeldict_SOURCES = main.cpp kbabeldictview.cpp kbabeldict.cpp kbabelsplash.cpp +kbabeldict_la_SOURCES = main.cpp kbabeldictview.cpp kbabeldict.cpp kbabelsplash.cpp # the libraries to link against. -kbabeldict_LDADD = libkbabeldict.la -kbabeldict_LDFLAGS = $(all_libraries) $(KDE_RPATH) +kbabeldict_la_LIBADD = libkbabeldict.la +kbabeldict_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module # these are the headers for your project noinst_HEADERS = kbabeldict.h kbabeldictview.h kbabelsplash.h aboutmoduledlg.h --- kdesdk-3.5.5/kbabel/kbabeldict/main.cpp 2006-07-22 04:11:50.000000000 -0400 +++ kdesdk-3.5.5-new/kbabel/kbabeldict/main.cpp 2006-10-30 11:35:10.000000000 -0500 @@ -107,7 +107,7 @@ }; -int main(int argc, char **argv) +extern "C" KDE_EXPORT int kdemain(int argc, char **argv) { KLocale::setMainCatalogue("kbabel"); --- kdesdk-3.5.5/kbugbuster/Makefile.am 2005-09-10 04:21:11.000000000 -0400 +++ kdesdk-3.5.5-new/kbugbuster/Makefile.am 2006-10-30 11:35:10.000000000 -0500 @@ -6,12 +6,14 @@ SUBDIRS = backend gui pics $(KRESOURCES_SUBDIR) -bin_PROGRAMS = kbugbuster +kdeinit_LTLIBRARIES = kbugbuster.la +bin_PROGRAMS = +lib_LTLIBRARIES = -kbugbuster_SOURCES = main.cpp -kbugbuster_LDADD = -lkutils gui/libkbbmainwindow.la \ +kbugbuster_la_SOURCES = main.cpp +kbugbuster_la_LIBADD = -lkutils gui/libkbbmainwindow.la \ backend/libkbbbackend.la $(LIB_KHTML) $(LIB_KIO) -kbugbuster_LDFLAGS = $(all_libraries) $(KDE_RPATH) +kbugbuster_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module xdg_apps_DATA = kbugbuster.desktop --- kdesdk-3.5.5/kbugbuster/configure.in.in 2005-09-10 04:21:11.000000000 -0400 +++ kdesdk-3.5.5-new/kbugbuster/configure.in.in 2006-10-30 11:35:10.000000000 -0500 @@ -2,6 +2,7 @@ KDE_CHECK_HEADER(libkcal/resourcecalendar.h,HAVE_KCAL=1, AC_MSG_WARN([Unable to find libkcal. The Bugzilla todo list \ resource for KOrganizer won't be compiled.])) +HAVE_KCAL=0 AM_CONDITIONAL(include_kcalresource, test "$HAVE_KCAL" = 1) ]) --- kdesdk-3.5.5/kbugbuster/main.cpp 2005-09-10 04:21:11.000000000 -0400 +++ kdesdk-3.5.5-new/kbugbuster/main.cpp 2006-10-30 11:35:10.000000000 -0500 @@ -42,7 +42,7 @@ KCmdLineLastOption }; -int main(int argc, char *argv[]) +extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) { KAboutData aboutData( "kbugbuster", I18N_NOOP( "KBugBuster" ), VERSION, description, KAboutData::License_GPL, --- kdesdk-3.5.5/kcachegrind/kcachegrind/Makefile.am 2005-09-10 04:21:07.000000000 -0400 +++ kdesdk-3.5.5-new/kcachegrind/kcachegrind/Makefile.am 2006-10-30 11:35:10.000000000 -0500 @@ -1,6 +1,8 @@ -bin_PROGRAMS = kcachegrind +kdeinit_LTLIBRARIES = kcachegrind.la +bin_PROGRAMS = +lib_LTLIBRARIES = -kcachegrind_SOURCES = \ +kcachegrind_la_SOURCES = \ functionselectionbase.ui \ stackselectionbase.ui \ partselectionbase.ui \ @@ -19,9 +21,10 @@ costlistitem.cpp partlistitem.cpp functionitem.cpp \ instritem.cpp stackitem.cpp callgraphview.cpp -kcachegrind_COMPILE_FIRST = ../version.h +kcachegrind_la_COMPILE_FIRST = ../version.h -kcachegrind_LDADD = $(LIB_KIO) +kcachegrind_la_LIBADD = $(LIB_KIO) +kcachegrind_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module KDE_ICON = AUTO @@ -43,9 +46,6 @@ METASOURCES = AUTO -# the library search path. -kcachegrind_LDFLAGS = $(all_libraries) $(KDE_RPATH) - rcdir = $(kde_datadir)/kcachegrind rc_DATA = kcachegrindui.rc --- kdesdk-3.5.5/kcachegrind/kcachegrind/main.cpp 2005-09-10 04:21:07.000000000 -0400 +++ kdesdk-3.5.5-new/kcachegrind/kcachegrind/main.cpp 2006-10-30 11:35:10.000000000 -0500 @@ -40,7 +40,7 @@ KCmdLineLastOption // End of options. }; -int main( int argc, char ** argv ) +extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) { KAboutData aboutData("kcachegrind", I18N_NOOP("KCachegrind"), --- kdesdk-3.5.5/kcachegrind/kcachegrind/sourceitem.h 2005-09-10 04:21:07.000000000 -0400 +++ kdesdk-3.5.5-new/kcachegrind/kcachegrind/sourceitem.h 2006-10-30 11:35:10.000000000 -0500 @@ -25,6 +25,7 @@ #include #include "tracedata.h" +#undef fileno class SourceView; --- kdesdk-3.5.5/kioslave/svn/configure.in.in 2005-10-10 10:58:25.000000000 -0400 +++ kdesdk-3.5.5-new/kioslave/svn/configure.in.in 2006-10-30 11:35:10.000000000 -0500 @@ -155,3 +155,5 @@ AC_SUBST(SVN_CPPFLAGS) AC_SUBST(SVNLD) AM_CONDITIONAL(include_kioslave_svn, test -n "$SVN_SUBDIR") + +export DO_NOT_COMPILE="$DO_NOT_COMPILE kioslave" --- kdesdk-3.5.5/kmtrace/Makefile.am 2005-09-10 04:20:58.000000000 -0400 +++ kdesdk-3.5.5-new/kmtrace/Makefile.am 2006-10-30 11:35:10.000000000 -0500 @@ -21,15 +21,16 @@ LDADD = $(LIB_KDECORE) -liberty INCLUDES = $(all_includes) -bin_PROGRAMS = kmtrace demangle kmmatch -kmtrace_SOURCES = kmtrace.cpp -kmtrace_LDFLAGS = $(all_libraries) +kdeinit_LTLIBRARIES = kmtrace.la demangle.la kmmatch.la +bin_PROGRAMS = +kmtrace_la_SOURCES = kmtrace.cpp +kmtrace_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -demangle_SOURCES = demangle.cpp -demangle_LDFLAGS = $(all_libraries) +demangle_la_SOURCES = demangle.cpp +demangle_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kmmatch_SOURCES = match.cpp -kmmatch_LDFLAGS = $(all_libraries) +kmmatch_la_SOURCES = match.cpp +kmmatch_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module bin_SCRIPTS = kminspector --- kdesdk-3.5.5/kmtrace/demangle.cpp 2005-09-10 04:20:58.000000000 -0400 +++ kdesdk-3.5.5-new/kmtrace/demangle.cpp 2006-10-30 11:35:10.000000000 -0500 @@ -36,7 +36,7 @@ } -int main(int argc, char **argv) +extern "C" KDE_EXPORT int kdemain(int argc, char **argv) { char buf[1024]; --- kdesdk-3.5.5/kmtrace/kmtrace.cpp 2005-10-10 10:58:21.000000000 -0400 +++ kdesdk-3.5.5-new/kmtrace/kmtrace.cpp 2006-10-30 11:35:10.000000000 -0500 @@ -576,7 +576,7 @@ KCmdLineLastOption }; -int main(int argc, char *argv[]) +extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) { KInstance instance("kmtrace"); --- kdesdk-3.5.5/kmtrace/match.cpp 2005-09-10 04:20:58.000000000 -0400 +++ kdesdk-3.5.5-new/kmtrace/match.cpp 2006-10-30 11:35:10.000000000 -0500 @@ -13,7 +13,7 @@ #include #include -int main(int argc, char **argv) +extern "C" KDE_EXPORT int kdemain(int argc, char **argv) { char buf[1024]; if (argc != 3) --- kdesdk-3.5.5/kompare/Makefile.am 2005-09-10 04:21:05.000000000 -0400 +++ kdesdk-3.5.5-new/kompare/Makefile.am 2006-10-30 11:35:10.000000000 -0500 @@ -22,12 +22,14 @@ ######################################################################### # this is the program that gets installed. it's name is used for all # of the other Makefile.am variables -bin_PROGRAMS = kompare +kdeinit_LTLIBRARIES = kompare.la +bin_PROGRAMS = +lib_LTLIBRARIES = # the application source, library search path, and link libraries -kompare_SOURCES = main.cpp kompare_shell.cpp kompareurldialog.cpp -kompare_LDFLAGS = $(all_libraries) -kompare_LDADD = $(LIB_KPARTS) \ +kompare_la_SOURCES = main.cpp kompare_shell.cpp kompareurldialog.cpp +kompare_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +kompare_la_LIBADD = $(LIB_KPARTS) \ $(top_builddir)/kompare/interfaces/libkompareinterface.la \ $(top_builddir)/kompare/libdialogpages/libdialogpages.la \ -lktexteditor --- kdesdk-3.5.5/kompare/main.cpp 2005-09-10 04:21:05.000000000 -0400 +++ kdesdk-3.5.5-new/kompare/main.cpp 2006-10-30 11:35:10.000000000 -0500 @@ -47,7 +47,7 @@ KCmdLineLastOption }; -int main(int argc, char *argv[]) +extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) { KAboutData aboutData( "kompare", I18N_NOOP("Kompare"), version, description, KAboutData::License_GPL, --- kdesdk-3.5.5/kspy/main.cpp 2005-09-10 04:20:58.000000000 -0400 +++ kdesdk-3.5.5-new/kspy/main.cpp 2006-10-30 11:35:10.000000000 -0500 @@ -32,7 +32,7 @@ // INSERT YOUR COMMANDLINE OPTIONS HERE }; -int main(int argc, char *argv[]) +extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) { KAboutData aboutData( "spy", I18N_NOOP("Spy"), --- kdesdk-3.5.5/kstartperf/Makefile.am 2005-09-10 04:20:58.000000000 -0400 +++ kdesdk-3.5.5-new/kstartperf/Makefile.am 2006-10-30 11:35:10.000000000 -0500 @@ -5,10 +5,11 @@ # libkstartperf_la_LIBADD = ../libltdl/libltdlc.la libkstartperf_la_SOURCES = libkstartperf.c -bin_PROGRAMS = kstartperf -kstartperf_LDFLAGS = $(all_libraries) -kstartperf_LDADD = $(LIB_KDECORE) -kstartperf_SOURCES = kstartperf.cpp +kdeinit_LTLIBRARIES = kstartperf.la +bin_PROGRAMS = +kstartperf_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +kstartperf_la_LIBADD = $(LIB_KDECORE) +kstartperf_la_SOURCES = kstartperf.cpp messages: $(XGETTEXT) $(kstartperf_SOURCES) -o $(podir)/kstartperf.pot --- kdesdk-3.5.5/kstartperf/kstartperf.cpp 2005-09-10 04:20:58.000000000 -0400 +++ kdesdk-3.5.5-new/kstartperf/kstartperf.cpp 2006-10-30 11:35:10.000000000 -0500 @@ -69,7 +69,7 @@ } -int main(int argc, char **argv) +extern "C" KDE_EXPORT int kdemain(int argc, char **argv) { KAboutData aboutData("kstartperf", I18N_NOOP("KStartPerf"), "1.0", I18N_NOOP("Measures start up time of a KDE application"), --- kdesdk-3.5.5/kuiviewer/Makefile.am 2005-09-10 04:21:10.000000000 -0400 +++ kdesdk-3.5.5-new/kuiviewer/Makefile.am 2006-10-30 11:35:10.000000000 -0500 @@ -21,12 +21,14 @@ ######################################################################### # this is the program that gets installed. it's name is used for all # of the other Makefile.am variables -bin_PROGRAMS = kuiviewer +kdeinit_LTLIBRARIES = kuiviewer.la +bin_PROGRAMS = +lib_LTLIBRARIES = # the application source, library search path, and link libraries -kuiviewer_SOURCES = main.cpp kuiviewer.cpp -kuiviewer_LDFLAGS = $(KDE_RPATH) $(all_libraries) -kuiviewer_LDADD = $(LIB_KPARTS) +kuiviewer_la_SOURCES = main.cpp kuiviewer.cpp +kuiviewer_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -module +kuiviewer_la_LIBADD = $(LIB_KPARTS) xdg_apps_DATA =kuiviewer.desktop --- kdesdk-3.5.5/kuiviewer/main.cpp 2005-09-10 04:21:10.000000000 -0400 +++ kdesdk-3.5.5-new/kuiviewer/main.cpp 2006-10-30 11:35:10.000000000 -0500 @@ -38,7 +38,7 @@ KCmdLineLastOption }; -int main(int argc, char **argv) +extern "C" KDE_EXPORT int kdemain(int argc, char **argv) { KAboutData about("kuiviewer", I18N_NOOP("KUIViewer"), "0.1", I18N_NOOP("Displays Designer's UI files"), --- kdesdk-3.5.5/poxml/Makefile.am 2005-09-10 04:21:06.000000000 -0400 +++ kdesdk-3.5.5-new/poxml/Makefile.am 2006-10-30 11:35:10.000000000 -0500 @@ -1,30 +1,31 @@ - -bin_PROGRAMS = split2po xml2pot po2xml swappo transxx +lib_LTLIBRARIES = +bin_PROGRAMS = +kdeinit_LTLIBRARIES = split2po.la xml2pot.la po2xml.la swappo.la transxx.la INCLUDES = -I$(srcdir)/antlr $(all_includes) KDE_CXXFLAGS = $(USE_EXCEPTIONS) SUBDIRS = antlr -split2po_SOURCES = split.cpp parser.cpp -split2po_LDFLAGS = $(all_libraries) $(KDE_RPATH) -split2po_LDADD = $(LIB_QT) - -xml2pot_SOURCES = xml2pot.cpp parser.cpp -xml2pot_LDFLAGS = $(all_libraries) $(KDE_RPATH) -xml2pot_LDADD = $(LIB_QT) - -po2xml_SOURCES = GettextLexer.cpp GettextParser.cpp po2xml.cpp parser.cpp -po2xml_LDFLAGS = $(all_libraries) $(KDE_RPATH) -po2xml_LDADD = antlr/src/libantlr.la $(LIB_QT) - -swappo_SOURCES = GettextLexer.cpp GettextParser.cpp swappo.cpp parser.cpp -swappo_LDFLAGS = $(all_libraries) $(KDE_RPATH) -swappo_LDADD = antlr/src/libantlr.la $(LIB_QT) - -transxx_SOURCES = GettextLexer.cpp GettextParser.cpp transxx.cpp parser.cpp -transxx_LDFLAGS = $(all_libraries) $(KDE_RPATH) -transxx_LDADD = antlr/src/libantlr.la $(LIB_QT) +split2po_la_SOURCES = split.cpp parser.cpp +split2po_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +split2po_la_LIBADD = $(LIB_QT) + +xml2pot_la_SOURCES = xml2pot.cpp parser.cpp +xml2pot_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +xml2pot_la_LIBADD = $(LIB_QT) + +po2xml_la_SOURCES = GettextLexer.cpp GettextParser.cpp po2xml.cpp parser.cpp +po2xml_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +po2xml_la_LIBADD = antlr/src/libantlr.la $(LIB_QT) + +swappo_la_SOURCES = GettextLexer.cpp GettextParser.cpp swappo.cpp parser.cpp +swappo_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +swappo_la_LIBADD = antlr/src/libantlr.la $(LIB_QT) + +transxx_la_SOURCES = GettextLexer.cpp GettextParser.cpp transxx.cpp parser.cpp +transxx_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +transxx_la_LIBADD = antlr/src/libantlr.la $(LIB_QT) parser: cd $(srcdir) && java antlr.Tool gettext.g --- kdesdk-3.5.5/poxml/po2xml.cpp 2005-09-10 04:21:06.000000000 -0400 +++ kdesdk-3.5.5-new/poxml/po2xml.cpp 2006-10-30 11:35:10.000000000 -0500 @@ -12,6 +12,8 @@ #include "antlr/AST.hpp" #include "antlr/CommonAST.hpp" +#include + using namespace std; QString translate(QString xml, QString orig, QString translation) @@ -38,7 +40,7 @@ return prefix + xml; } -int main( int argc, char **argv ) +extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) { if (argc != 3) { qWarning("usage: %s english-XML translated-PO", argv[0]); --- kdesdk-3.5.5/poxml/split.cpp 2005-11-19 05:24:05.000000000 -0500 +++ kdesdk-3.5.5-new/poxml/split.cpp 2006-10-30 11:35:10.000000000 -0500 @@ -1,10 +1,11 @@ #include "parser.h" #include #include +#include using namespace std; -int main( int argc, char **argv ) +extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) { bool report_mismatches = qstrcmp(getenv("REPORT_MISMATCHES"), "no"); --- kdesdk-3.5.5/poxml/swappo.cpp 2005-09-10 04:21:06.000000000 -0400 +++ kdesdk-3.5.5-new/poxml/swappo.cpp 2006-10-30 11:35:10.000000000 -0500 @@ -3,8 +3,9 @@ #include "GettextParser.hpp" #include #include "GettextLexer.hpp" +#include -int main(int argc, char **argv) +extern "C" KDE_EXPORT int kdemain(int argc, char **argv) { if ( argc != 2 ) { qWarning( "usage: %s pofile", argv[0] ); --- kdesdk-3.5.5/poxml/transxx.cpp 2005-10-10 10:58:21.000000000 -0400 +++ kdesdk-3.5.5-new/poxml/transxx.cpp 2006-10-30 11:35:10.000000000 -0500 @@ -8,7 +8,9 @@ #include #include -int main(int argc, char **argv) +#include + +extern "C" KDE_EXPORT int kdemain(int argc, char **argv) { if ( argc != 2 && argc != 4 ) { qWarning( "usage: %s [--text translation] potfile", argv[0] ); --- kdesdk-3.5.5/poxml/xml2pot.cpp 2005-09-10 04:21:06.000000000 -0400 +++ kdesdk-3.5.5-new/poxml/xml2pot.cpp 2006-10-30 11:35:10.000000000 -0500 @@ -3,10 +3,11 @@ #include #include #include +#include using namespace std; -int main( int argc, char **argv ) +extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) { if (argc != 2) { qWarning("usage: %s english-XML", argv[0]); --- kdesdk-3.5.5/umbrello/umbrello/Makefile.am 2006-10-01 13:27:44.000000000 -0400 +++ kdesdk-3.5.5-new/umbrello/umbrello/Makefile.am 2006-10-30 11:36:15.000000000 -0500 @@ -1,7 +1,9 @@ -bin_PROGRAMS = umbrello +bin_PROGRAMS = +lib_LTLIBRARIES = +kdeinit_LTLIBRARIES = umbrello.la -umbrello_COMPILE_FIRST = version.h -umbrello_SOURCES = activitywidget.cpp \ +umbrello_la_COMPILE_FIRST = version.h +umbrello_la_SOURCES = activitywidget.cpp \ actor.cpp \ actorwidget.cpp \ aligntoolbar.cpp \ @@ -115,7 +117,7 @@ worktoolbar.cpp #umbrello_LDADD = ./refactoring/librefactoring.la ./codeimport/libcodeimport.la ./codeimport/kdevcppparser/libkdevcppparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la $(AUTOLAYOUT_LIBS) $(LIB_KDEPRINT) $(LIB_KIO) -umbrello_LDADD = ./refactoring/librefactoring.la ./codeimport/libcodeimport.la ./codeimport/kdevcppparser/libkdevcppparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la ./docgenerators/libdocgenerators.la $(LIB_KDEPRINT) $(LIB_KIO) +umbrello_la_LIBADD = ./refactoring/librefactoring.la ./codeimport/libcodeimport.la ./codeimport/kdevcppparser/libkdevcppparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la ./docgenerators/libdocgenerators.la $(LIB_KDEPRINT) $(LIB_KIO) ## See section "dnl Not GPL compatible" in ../configure.in.in # SUBDIRS = $(AUTOLAYOUT_DIR) codeimport dialogs clipboard pics codegenerators headings refactoring @@ -136,7 +138,7 @@ METASOURCES = AUTO -umbrello_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic +umbrello_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -export-dynamic messages: rc.cpp $(PREPARETIPS) > tips.cpp --- kdesdk-3.5.5/umbrello/umbrello/main.cpp 2006-10-01 13:27:44.000000000 -0400 +++ kdesdk-3.5.5-new/umbrello/umbrello/main.cpp 2006-10-30 11:35:10.000000000 -0500 @@ -89,7 +89,7 @@ return 0; } -int main(int argc, char *argv[]) { +extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) { KAboutData aboutData( "umbrello", I18N_NOOP("Umbrello UML Modeller"), UMBRELLO_VERSION, description, KAboutData::License_GPL, I18N_NOOP("(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"), 0, --- kdesdk-3.5.6/kbabel/catalogmanager/libsvn/svnhandler.h 2007-01-15 06:24:26.000000000 -0500 +++ kdesdk-3.5.6-new/kbabel/catalogmanager/libsvn/svnhandler.h 2007-01-17 16:24:05.000000000 -0500 @@ -47,6 +47,9 @@ class KSharedConfig; +#undef stderr +#undef stdout + /** * This class is the backend for SVN support in Catalog Manager. *