diff -Nurd kdeedu-3.5.10/blinken/src/Makefile.am kdeedu-3.5.10-new/blinken/src/Makefile.am
--- kdeedu-3.5.10/blinken/src/Makefile.am 2005-09-10 04:16:48.000000000 -0400
+++ kdeedu-3.5.10-new/blinken/src/Makefile.am 2010-07-21 16:53:56.000000000 -0400
@@ -9,7 +9,7 @@
INCLUDES = $(all_includes)
blinken_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-blinken_LDADD = $(LIB_KDEUI) $(LIB_KIO) $(artslib)
+blinken_LDADD = $(LIB_KDEUI) $(LIB_KIO) $(artslib) $(LIB_QT) $(LIB_KDECORE)
blinken_SOURCES = main.cpp blinken.cpp artsplayer.cpp blinkengame.cpp number.cpp highscoredialog.cpp counter.cpp fontutils.cpp fontchecker.cpp button.cpp settings.kcfgc
diff -Nurd kdeedu-3.5.10/kalzium/src/Makefile.am kdeedu-3.5.10-new/kalzium/src/Makefile.am
--- kdeedu-3.5.10/kalzium/src/Makefile.am 2005-09-10 10:24:07.000000000 -0400
+++ kdeedu-3.5.10-new/kalzium/src/Makefile.am 2010-07-21 15:50:23.000000000 -0400
@@ -1,8 +1,11 @@
# set the include path for X, qt and KDE
INCLUDES= -I$(srcdir)/../../libkdeedu/kdeeduplot -I$(srcdir)/../../libkdeedu/kdeeduui $(all_includes)
-bin_PROGRAMS = kalzium
-kalzium_SOURCES = eqresult.cpp eqchemview.cpp kalzium.cpp \
+bin_PROGRAMS =
+lib_LTLIBRARIES =
+kdeinit_LTLIBRARIES = kalzium.la
+
+kalzium_la_SOURCES = eqresult.cpp eqchemview.cpp kalzium.cpp \
main.cpp \
periodictableview.cpp \
element.cpp \
@@ -35,7 +38,7 @@
moleculeparser.cpp \
tempunit.cpp
-kalzium_LDADD = ../../libkdeedu/kdeeduplot/libkdeeduplot.la ../../libkdeedu/kdeeduui/libkdeeduui.la $(LIB_KIO) $(LIB_KDEUI) $(LIB_KHTML) -L$(OCAMLLIB) -L$(FACILELIB) $(EQCHEM_LDADD)
+kalzium_la_LIBADD = ../../libkdeedu/kdeeduplot/libkdeeduplot.la ../../libkdeedu/kdeeduui/libkdeeduui.la $(LIB_KIO) $(LIB_KDEUI) $(LIB_KHTML) -L$(OCAMLLIB) -L$(FACILELIB) $(EQCHEM_LDADD) -lkdefx
KDE_CXXFLAGS = -D_ISOC99_SOURCE
SUBDIRS = icons elementpics data $(EQCHEM_SUB)
@@ -79,7 +82,7 @@
KDE_ICON = AUTO
# the library search path.
-kalzium_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kalzium_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
#this RegExp-monster grep for bar and puts the i18n() around foo and bar
messages-old: rc.cpp
diff -Nurd kdeedu-3.5.9/kalzium/src/main.cpp kdeedu-3.5.9-new/kalzium/src/main.cpp
--- kdeedu-3.5.9/kalzium/src/main.cpp 2006-10-01 13:24:17.000000000 -0400
+++ kdeedu-3.5.9-new/kalzium/src/main.cpp 2008-02-13 21:57:24.000000000 -0500
@@ -43,7 +43,7 @@
};
#endif
-int main(int argc, char **argv)
+extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
{
#ifdef HAVE_FACILE
caml_startup(argv);
diff -Nurd kdeedu-3.5.10/kanagram/src/Makefile.am kdeedu-3.5.10-new/kanagram/src/Makefile.am
--- kdeedu-3.5.10/kanagram/src/Makefile.am 2005-10-10 10:55:35.000000000 -0400
+++ kdeedu-3.5.10-new/kanagram/src/Makefile.am 2010-07-21 16:53:02.000000000 -0400
@@ -29,7 +29,7 @@
# the application source, library search path, and link libraries
kanagram_SOURCES = main.cpp kanagram.cpp kanagramgame.cpp fontutils.cpp kanagramsettings.kcfgc mainsettingswidget.ui vocabsettingswidget.ui vocabeditwidget.ui mainsettings.cpp vocabsettings.cpp vocabedit.cpp keduvocdocument.cpp keduvocexpression.cpp keduvockvtmlreader.cpp keduvockvtmlwriter.cpp leitnerbox.cpp leitnersystem.cpp multiplechoice.cpp grammarmanager.cpp leitnersystemview.cpp newstuffwidget.ui newstuffdialog.cpp newstuff.cpp
kanagram_LDFLAGS = $(KDE_RPATH) $(all_libraries)
-kanagram_LDADD = $(LIB_KDEUI) $(LIB_KNEWSTUFF) $(LIB_KIO) $(artslib)
+kanagram_LDADD = $(LIB_KDEUI) $(LIB_KNEWSTUFF) $(LIB_KIO) $(artslib) $(LIB_QT) $(LIB_KDECORE)
kde_kcfg_DATA=kanagram.kcfg
diff -Nurd kdeedu-3.5.10/kbruch/src/Makefile.am kdeedu-3.5.10-new/kbruch/src/Makefile.am
--- kdeedu-3.5.10/kbruch/src/Makefile.am 2005-09-10 04:18:00.000000000 -0400
+++ kdeedu-3.5.10-new/kbruch/src/Makefile.am 2010-07-21 16:26:35.000000000 -0400
@@ -1,10 +1,14 @@
-bin_PROGRAMS = kbruch
-kbruch_COMPILE_FIRST = version.h
-kbruch_SOURCES = exercisebase.cpp taskvieweroptionsbase.ui task.cpp ratio.cpp taskview.cpp statisticsview.cpp primenumber.cpp kbruch.cpp mainqtwidget.cpp taskwidget.cpp fractionbasewidget.cpp resultwidget.cpp exercisecompare.cpp ratiowidget.cpp rationalwidget.cpp exerciseconvert.cpp exercisefactorize.cpp factorizedwidget.cpp settingsclass.kcfgc
-kbruch_LDADD = $(LIB_KDEUI)
+bin_PROGRAMS =
+lib_LTLIBRARIES =
+kdeinit_LTLIBRARIES = kbruch.la
+
+kbruch.cpp: version.h
+
+kbruch_la_SOURCES = exercisebase.cpp taskvieweroptionsbase.ui task.cpp ratio.cpp taskview.cpp statisticsview.cpp primenumber.cpp kbruch.cpp mainqtwidget.cpp taskwidget.cpp fractionbasewidget.cpp resultwidget.cpp exercisecompare.cpp ratiowidget.cpp rationalwidget.cpp exerciseconvert.cpp exercisefactorize.cpp factorizedwidget.cpp settingsclass.kcfgc
+kbruch_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
# the library search path.
-kbruch_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kbruch_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
EXTRA_DIST = kbruch.cpp kbruch.h kbruch.desktop hi32-app-kbruch.png hi16-app-kbruch.png lo32-app-kbruch.png lo16-app-kbruch.png mainqtwidget.cpp mainqtwidget.h primenumber.cpp primenumber.h statisticsview.cpp statisticsview.h exercisebase.cpp exercisebase.h taskview.cpp taskview.h ratio.cpp ratio.h task.cpp task.h taskwidget.cpp taskwidget.h fractionbasewidget.cpp fractionbasewidget.h resultwidget.cpp resultwidget.h exercisecompare.cpp exercisecompare.h ratiowidget.cpp ratiowidget.h rationalwidget.cpp rationalwidget.h exerciseconvert.cpp exerciseconvert.h exercisefactorize.cpp exercisefactorize.h factorizedwidget.cpp factorizedwidget.h kbruch.rc taskvieweroptionsbase.ui
diff -Nurd kdeedu-3.5.9/kbruch/src/kbruch.cpp kdeedu-3.5.9-new/kbruch/src/kbruch.cpp
--- kdeedu-3.5.9/kbruch/src/kbruch.cpp 2007-05-14 03:38:52.000000000 -0400
+++ kdeedu-3.5.9-new/kbruch/src/kbruch.cpp 2008-02-13 21:57:25.000000000 -0500
@@ -29,7 +29,7 @@
#include
/* the main program */
-int main(int argc, char * argv[])
+extern "C" KDE_EXPORT int kdemain(int argc, char * argv[])
{
// init random generator
srand(time(NULL));
diff -Nurd kdeedu-3.5.10/keduca/keduca/Makefile.am kdeedu-3.5.10-new/keduca/keduca/Makefile.am
--- kdeedu-3.5.10/keduca/keduca/Makefile.am 2005-09-10 04:17:25.000000000 -0400
+++ kdeedu-3.5.10-new/keduca/keduca/Makefile.am 2010-07-21 15:43:23.000000000 -0400
@@ -1,11 +1,13 @@
# set the include path for X, qt and KDE
-INCLUDES= -I../libkeduca $(all_includes)
+INCLUDES= -I$(srcdir)/../libkeduca $(all_includes)
# The binary program keduca
-bin_PROGRAMS = keduca
-keduca_LDFLAGS = $(all_libraries)
-keduca_LDADD = $(LIB_KFILE) $(LIB_KPARTS) ../libkeduca/libkeduca.la
-keduca_SOURCES = main.cpp keduca.cpp
+bin_PROGRAMS =
+lib_LTLIBRARIES =
+kdeinit_LTLIBRARIES = keduca.la
+keduca_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+keduca_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) ../libkeduca/libkeduca.la $(LIB_KDECORE) $(LIB_KDEUI)
+keduca_la_SOURCES = main.cpp keduca.cpp
# Convenience library
#noinst_LTLIBRARIES = libkeduca_common.la
@@ -18,7 +20,7 @@
# The KParts Component
kde_module_LTLIBRARIES = libkeducapart.la
libkeducapart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
-libkeducapart_la_LIBADD = ../libkeduca/libkeduca.la $(LIB_KPARTS)
+libkeducapart_la_LIBADD = ../libkeduca/libkeduca.la $(LIB_KPARTS) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
libkeducapart_la_SOURCES = keduca_part.cpp kradioeduca.cpp kquestion.cpp \
kgroupeduca.cpp keducaview.cpp keducaprefs.cpp \
kcheckeduca.cpp settings.kcfgc configdialogbase.ui
diff -Nurd kdeedu-3.5.9/keduca/keduca/main.cpp kdeedu-3.5.9-new/keduca/keduca/main.cpp
--- kdeedu-3.5.9/keduca/keduca/main.cpp 2005-09-10 04:17:25.000000000 -0400
+++ kdeedu-3.5.9-new/keduca/keduca/main.cpp 2008-02-13 21:57:25.000000000 -0500
@@ -31,7 +31,7 @@
KCmdLineLastOption
};
-int main(int argc, char *argv[])
+extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
{
KAboutData aboutData( "keduca", I18N_NOOP("KEduca"),
version, description, KAboutData::License_GPL,
diff -Nurd kdeedu-3.5.10/keduca/keducabuilder/Makefile.am kdeedu-3.5.10-new/keduca/keducabuilder/Makefile.am
--- kdeedu-3.5.10/keduca/keducabuilder/Makefile.am 2005-09-10 04:17:25.000000000 -0400
+++ kdeedu-3.5.10-new/keduca/keducabuilder/Makefile.am 2010-07-21 15:46:00.000000000 -0400
@@ -1,6 +1,10 @@
-bin_PROGRAMS = keducabuilder
-keducabuilder_SOURCES = kcontroladdeditbase.ui keducaeditorstartdialogbase.ui keducaeditorstartdialog.cpp ktagcombobox.cpp klangcombo.cpp kcontrolheader.cpp keducabuilder.cpp kcontroladdedit.cpp main.cpp
-keducabuilder_LDADD = $(LIB_KFILE) ../libkeduca/libkeduca.la
+
+bin_PROGRAMS =
+lib_LTLIBRARIES =
+kdeinit_LTLIBRARIES = keducabuilder.la
+
+keducabuilder_la_SOURCES = kcontroladdeditbase.ui keducaeditorstartdialogbase.ui keducaeditorstartdialog.cpp ktagcombobox.cpp klangcombo.cpp kcontrolheader.cpp keducabuilder.cpp kcontroladdedit.cpp main.cpp
+keducabuilder_la_LIBADD = $(LIB_KFILE) ../libkeduca/libkeduca.la $(LIB_KDECORE) $(LIB_KDEUI)
EXTRA_DIST = main.cpp kcontroladdedit.cpp kcontroladdedit.h keducabuilder.cpp keducabuilder.h kcontrolheader.cpp kcontrolheader.h keducabuilderui.rc klangcombo.cpp klangcombo.h ktagcombobox.cpp ktagcombobox.h keducaeditorstartdialog.cpp keducaeditorstartdialog.h
@@ -18,12 +22,12 @@
# kde_wallpaperdir Where general wallpapers should go to.
# set the include path for X, qt and KDE
-INCLUDES= -I../libkeduca $(all_includes)
+INCLUDES= -I$(srcdir)/../libkeduca $(all_includes)
METASOURCES = AUTO
# the library search path.
-keducabuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+keducabuilder_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
# Uncomment the following two lines if you add a ui.rc file for your application to make use of
# KDE´s XML GUI builing
diff -Nurd kdeedu-3.5.9/keduca/keducabuilder/main.cpp kdeedu-3.5.9-new/keduca/keducabuilder/main.cpp
--- kdeedu-3.5.9/keduca/keducabuilder/main.cpp 2005-09-10 04:17:25.000000000 -0400
+++ kdeedu-3.5.9-new/keduca/keducabuilder/main.cpp 2008-02-13 21:57:25.000000000 -0500
@@ -32,7 +32,7 @@
KCmdLineLastOption
};
-int main(int argc, char *argv[])
+extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
{
KAboutData aboutData( "keduca", I18N_NOOP("KEducaBuilder"),
version, description, KAboutData::License_GPL,
diff -Nurd kdeedu-3.5.10/keduca/libkeduca/Makefile.am kdeedu-3.5.10-new/keduca/libkeduca/Makefile.am
--- kdeedu-3.5.10/keduca/libkeduca/Makefile.am 2005-09-10 04:17:25.000000000 -0400
+++ kdeedu-3.5.10-new/keduca/libkeduca/Makefile.am 2010-07-21 15:22:35.000000000 -0400
@@ -3,7 +3,7 @@
noinst_LTLIBRARIES = libkeduca.la
libkeduca_la_SOURCES = kgallerydialogbase.ui fileread.cpp kgallerydialog.cpp
libkeduca_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-libkeduca_la_LIBADD = -lkdeprint
+libkeduca_la_LIBADD = -lkdeprint $(LIB_QT)
noinst_HEADERS = fileread.h kgallerydialog.h kgallerydialogbase.h
METASOURCES=AUTO
diff -Nurd kdeedu-3.5.10/kgeography/src/Makefile.am kdeedu-3.5.10-new/kgeography/src/Makefile.am
--- kdeedu-3.5.10/kgeography/src/Makefile.am 2005-09-10 04:17:30.000000000 -0400
+++ kdeedu-3.5.10-new/kgeography/src/Makefile.am 2010-07-21 15:19:09.000000000 -0400
@@ -11,7 +11,7 @@
kgeography_LDFLAGS = $(all_libraries) $(KDE_RPATH)
# the libraries to link against.
-kgeography_LDADD = $(LIB_KDEUI)
+kgeography_LDADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
# which sources should be compiled for kgeography
kgeography_SOURCES = main.cpp mapwidget.cpp division.cpp map.cpp mapparser.cpp kgeography.cpp mapchooser.cpp mypopup.cpp popupmanager.cpp settings.kcfgc flagdivisionasker.cpp askwidget.cpp mapasker.cpp capitaldivisionasker.cpp divisioncapitalasker.cpp boxasker.cpp divisionflagasker.cpp answer.cpp answersdialog.cpp
diff -Nurd kdeedu-3.5.9/khangman/khangman/Makefile.am kdeedu-3.5.9-new/khangman/khangman/Makefile.am
--- kdeedu-3.5.9/khangman/khangman/Makefile.am 2005-09-10 04:16:50.000000000 -0400
+++ kdeedu-3.5.9-new/khangman/khangman/Makefile.am 2008-02-13 21:57:25.000000000 -0500
@@ -1,7 +1,11 @@
####### kdevelop will overwrite this part!!! (begin)##########
-bin_PROGRAMS = khangman
-khangman_SOURCES = khangman.cpp main.cpp khangmanview.cpp prefs.kcfgc khnewstuff.cpp normal.ui advanced.ui timerdlg.ui timer.cpp fontchecker.cpp
-khangman_LDADD = $(LIB_KDEUI) $(LIB_KIO) $(top_builddir)/libkdeedu/kdeeducore/libkdeeducore.la -lknewstuff
+
+bin_PROGRAMS =
+lib_LTLIBRARIES =
+kdeinit_LTLIBRARIES = khangman.la
+
+khangman_la_SOURCES = khangman.cpp main.cpp khangmanview.cpp prefs.kcfgc khnewstuff.cpp normal.ui advanced.ui timerdlg.ui timer.cpp fontchecker.cpp
+khangman_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(top_builddir)/libkdeedu/kdeeducore/libkdeeducore.la -lknewstuff
SUBDIRS = data pics sounds icons fonts
@@ -17,7 +21,7 @@
METASOURCES = AUTO
# the library search path.
-khangman_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+khangman_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
rc_DATA = khangmanui.rc
rcdir = $(kde_datadir)/khangman
diff -Nurd kdeedu-3.5.9/khangman/khangman/main.cpp kdeedu-3.5.9-new/khangman/khangman/main.cpp
--- kdeedu-3.5.9/khangman/khangman/main.cpp 2007-01-15 06:20:03.000000000 -0500
+++ kdeedu-3.5.9-new/khangman/khangman/main.cpp 2008-02-13 21:57:25.000000000 -0500
@@ -39,7 +39,7 @@
KCmdLineLastOption
};
-int main(int argc, char **argv)
+extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
{
KAboutData aboutData( "khangman", I18N_NOOP("KHangMan"),
KHM_VERSION, description, KAboutData::License_GPL,
diff -Nurd kdeedu-3.5.10/kig/Makefile.am kdeedu-3.5.10-new/kig/Makefile.am
--- kdeedu-3.5.10/kig/Makefile.am 2005-10-10 10:55:35.000000000 -0400
+++ kdeedu-3.5.10-new/kig/Makefile.am 2010-07-21 15:14:49.000000000 -0400
@@ -24,7 +24,7 @@
kde_module_LTLIBRARIES = libkigpart.la
libkigpart_la_SOURCES = dummy.cpp
libkigpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-libkigpart_la_LIBADD = $(LIB_KPARTS) \
+libkigpart_la_LIBADD = $(LIB_KPARTS) $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) \
misc/libmisc.la objects/libobjects.la filters/libfilters.la \
modes/libmodes.la kig/libkigparttemp.la $(scriptinglib)
diff -Nurd kdeedu-3.5.10/kig/kfile/Makefile.am kdeedu-3.5.10-new/kig/kfile/Makefile.am
--- kdeedu-3.5.10/kig/kfile/Makefile.am 2005-09-10 04:17:17.000000000 -0400
+++ kdeedu-3.5.10-new/kig/kfile/Makefile.am 2010-07-21 15:16:55.000000000 -0400
@@ -10,11 +10,11 @@
kfile_drgeo_la_SOURCES = kfile_drgeo.cpp
kfile_drgeo_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kfile_drgeo_la_LIBADD = $(LIB_KIO)
+kfile_drgeo_la_LIBADD = $(LIB_KIO) $(LIB_KDECORE) $(LIB_QT)
kfile_kig_la_SOURCES = kfile_kig.cpp
kfile_kig_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kfile_kig_la_LIBADD = $(LIB_KIO)
+kfile_kig_la_LIBADD = $(LIB_KIO) $(LIB_KDECORE) $(LIB_QT)
METASOURCES = AUTO
diff -Nurd kdeedu-3.5.9/kig/kig/Makefile.am kdeedu-3.5.9-new/kig/kig/Makefile.am
--- kdeedu-3.5.9/kig/kig/Makefile.am 2005-09-10 04:17:20.000000000 -0400
+++ kdeedu-3.5.9-new/kig/kig/Makefile.am 2008-02-13 21:57:25.000000000 -0500
@@ -19,12 +19,14 @@
#########################################################################
# this is the program that gets installed. it's name is used for all
# of the other Makefile.am variables
-bin_PROGRAMS = kig
+bin_PROGRAMS =
+lib_LTLIBRARIES =
+kdeinit_LTLIBRARIES = kig.la
# the application source, library search path, and link libraries
-kig_SOURCES = main.cpp kig.cpp
-kig_LDFLAGS = $(KDE_RPATH) $(all_libraries)
-kig_LDADD = $(LIB_KPARTS)
+kig_la_SOURCES = main.cpp kig.cpp
+kig_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -module
+kig_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KIO) -lDCOP
# this is where the desktop file will go
xdg_apps_DATA = kig.desktop
diff -Nurd kdeedu-3.5.9/kig/kig/main.cpp kdeedu-3.5.9-new/kig/kig/main.cpp
--- kdeedu-3.5.9/kig/kig/main.cpp 2005-10-10 10:55:35.000000000 -0400
+++ kdeedu-3.5.9-new/kig/kig/main.cpp 2008-02-13 21:57:25.000000000 -0500
@@ -101,7 +101,7 @@
return (*converterfunction)( file, outfile );
}
-int main(int argc, char **argv)
+extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
{
KAboutData *about = kigAboutData( "kig", I18N_NOOP("Kig") );
diff -Nurd kdeedu-3.5.10/kiten/Makefile.am kdeedu-3.5.10-new/kiten/Makefile.am
--- kdeedu-3.5.10/kiten/Makefile.am 2005-09-10 04:17:15.000000000 -0400
+++ kdeedu-3.5.10-new/kiten/Makefile.am 2010-07-21 14:55:28.000000000 -0400
@@ -2,18 +2,19 @@
SUBDIRS = pics
-kiten_SOURCES = main.cpp kiten.cpp learn.cpp kloader.cpp ksaver.cpp \
+kiten_la_SOURCES = main.cpp kiten.cpp learn.cpp kloader.cpp ksaver.cpp \
configsearching.ui configlearn.ui configfont.ui configdictionariesbase.ui \
configdictionaries.cpp optiondialog.cpp kitenconfig.kcfgc
-kiten_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-kiten_LDADD = libkiten.la $(LIB_KIO)
+kiten_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+kiten_la_LIBADD = libkiten.la $(LIB_KIO)
-bin_PROGRAMS = kiten kitengen
+bin_PROGRAMS = kitengen
lib_LTLIBRARIES = libkiten.la
+kdeinit_LTLIBRARIES = kiten.la
libkiten_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -version-info 1:0:0
-libkiten_la_LIBADD = $(LIB_KDEUI) $(LIB_KDEPRINT)
+libkiten_la_LIBADD = $(LIB_KDEUI) $(LIB_KDEPRINT) $(LIB_QT) $(LIB_KDECORE)
libkiten_la_SOURCES = asyndeta.cpp dict.cpp widgets.cpp kromajiedit.cpp rad.cpp \
deinf.cpp kitenconfig.kcfgc
diff -Nurd kdeedu-3.5.9/kiten/main.cpp kdeedu-3.5.9-new/kiten/main.cpp
--- kdeedu-3.5.9/kiten/main.cpp 2005-10-10 10:55:32.000000000 -0400
+++ kdeedu-3.5.9-new/kiten/main.cpp 2008-02-13 21:57:25.000000000 -0500
@@ -37,7 +37,7 @@
// INSERT YOUR COMMANDLINE OPTIONS HERE
};
-int main(int argc, char *argv[])
+extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
{
qInstallMsgHandler(noMessageOutput);
KAboutData aboutData( "kiten", I18N_NOOP("Kiten"),
diff -Nurd kdeedu-3.5.9/kiten/xjdxgen.c kdeedu-3.5.9-new/kiten/xjdxgen.c
--- kdeedu-3.5.9/kiten/xjdxgen.c 2006-05-22 14:03:43.000000000 -0400
+++ kdeedu-3.5.9-new/kiten/xjdxgen.c 2008-02-13 21:57:25.000000000 -0500
@@ -23,6 +23,7 @@
-- jason */
#include
+#include
#include
#include
#include
diff -Nurd kdeedu-3.5.10/klatin/klatin/Makefile.am kdeedu-3.5.10-new/klatin/klatin/Makefile.am
--- kdeedu-3.5.10/klatin/klatin/Makefile.am 2005-09-10 04:17:24.000000000 -0400
+++ kdeedu-3.5.10-new/klatin/klatin/Makefile.am 2010-07-21 16:32:39.000000000 -0400
@@ -6,19 +6,21 @@
# this is the program that gets installed. it's name is used for all
# of the other Makefile.am variables
-bin_PROGRAMS = klatin
+bin_PROGRAMS =
+lib_LTLIBRARIES =
+kdeinit_LTLIBRARIES = klatin.la
# set the include path for X, qt and KDE
INCLUDES = $(all_includes)
# the library search path.
-klatin_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+klatin_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -module
# the libraries to link against.
-klatin_LDADD = $(LIB_KFILE) $(top_builddir)/libkdeedu/kdeeducore/libkdeeducore.la
+klatin_la_LIBADD = $(LIB_KFILE) $(top_builddir)/libkdeedu/kdeeducore/libkdeeducore.la $(LIB_KDEUI)
# which sources should be compiled for klatin
-klatin_SOURCES = main.cpp klatin.cpp klatingrammar.cpp klatinverbs.cpp klatinvocab.cpp \
+klatin_la_SOURCES = main.cpp klatin.cpp klatingrammar.cpp klatinverbs.cpp klatinvocab.cpp \
klatinchoose.ui settings.kcfgc klatingrammarwidget.ui klatinvocabwidget.ui klatinverbswidget.ui \
klatinresultsdialog.ui klatinsettings_vocabpage.ui
diff -Nurd kdeedu-3.5.9/klatin/klatin/main.cpp kdeedu-3.5.9-new/klatin/klatin/main.cpp
--- kdeedu-3.5.9/klatin/klatin/main.cpp 2005-09-10 04:17:24.000000000 -0400
+++ kdeedu-3.5.9-new/klatin/klatin/main.cpp 2008-02-13 21:57:25.000000000 -0500
@@ -29,7 +29,7 @@
KCmdLineLastOption
};
-int main(int argc, char *argv[])
+extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
{
KAboutData aboutData( "klatin", I18N_NOOP("KLatin"),
diff -Nurd kdeedu-3.5.10/klettres/klettres/Makefile.am kdeedu-3.5.10-new/klettres/klettres/Makefile.am
--- kdeedu-3.5.10/klettres/klettres/Makefile.am 2005-09-10 04:16:56.000000000 -0400
+++ kdeedu-3.5.10-new/klettres/klettres/Makefile.am 2010-07-21 16:44:15.000000000 -0400
@@ -1,10 +1,13 @@
####### kdevelop will overwrite this part!!! (begin)##########
-bin_PROGRAMS = klettres
+
+bin_PROGRAMS =
+lib_LTLIBRARIES =
+kdeinit_LTLIBRARIES = klettres.la
## INCLUDES were found outside kdevelop specific part
-klettres_SOURCES = fontsdlg.ui klettres.cpp klnewstuff.cpp main.cpp klettresview.cpp soundfactory.cpp prefs.kcfgc timerdlg.ui timer.cpp
-klettres_LDADD = $(LIB_KDEUI) -lknewstuff
+klettres_la_SOURCES = fontsdlg.ui klettres.cpp klnewstuff.cpp main.cpp klettresview.cpp soundfactory.cpp prefs.kcfgc timerdlg.ui timer.cpp
+klettres_la_LIBADD = $(LIB_KDEUI) -lknewstuff $(LIB_QT) $(LIB_KDECORE) $(LIB_KIO)
SUBDIRS = pics data icons
@@ -24,7 +27,7 @@
KDE_ICON = AUTO
# the library search path.
-klettres_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+klettres_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/klettres.pot;
diff -Nurd kdeedu-3.5.9/klettres/klettres/main.cpp kdeedu-3.5.9-new/klettres/klettres/main.cpp
--- kdeedu-3.5.9/klettres/klettres/main.cpp 2007-01-15 06:20:04.000000000 -0500
+++ kdeedu-3.5.9-new/klettres/klettres/main.cpp 2008-02-13 21:57:25.000000000 -0500
@@ -43,7 +43,7 @@
KCmdLineLastOption
};
-int main(int argc, char **argv)
+extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
{
KAboutData about("klettres", I18N_NOOP("KLettres"), KLETTRES_VERSION, description,
KAboutData::License_GPL, "(C) 2001-2006 Anne-Marie Mahfouf",0, "http://edu.kde.org/klettres", "submit@bugs.kde.org");
diff -Nurd kdeedu-3.5.10/kmplot/kmplot/Makefile.am kdeedu-3.5.10-new/kmplot/kmplot/Makefile.am
--- kdeedu-3.5.10/kmplot/kmplot/Makefile.am 2005-09-10 04:17:09.000000000 -0400
+++ kdeedu-3.5.10-new/kmplot/kmplot/Makefile.am 2010-07-21 16:42:59.000000000 -0400
@@ -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 = kmplot
+bin_PROGRAMS =
+lib_LTLIBRARIES =
+kdeinit_LTLIBRARIES = kmplot.la
# the application source, library search path, and link libraries
-kmplot_SOURCES = main.cpp kmplot.cpp kmplotprogress.cpp kmplotIface.skel
-kmplot_LDFLAGS = $(KDE_RPATH) $(all_libraries)
-kmplot_LDADD = $(LIB_KPARTS)
+kmplot_la_SOURCES = main.cpp kmplot.cpp kmplotprogress.cpp kmplotIface.skel
+kmplot_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -module
+kmplot_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
# this is where the desktop file will go
appmimedir = $(kde_mimedir)/application
@@ -45,7 +47,7 @@
# the Part's source, library search path, and link libraries
libkmplotpart_la_SOURCES = FktDlgData.ui parser.cpp xparser.cpp diagr.cpp View.cpp MainDlg.cpp FktDlg.cpp kprinterdlg.cpp settings.kcfgc settingspagecolor.ui kconstanteditor.cpp qparametereditor.ui kparametereditor.cpp settingspagecoords.ui settingspagefonts.ui settingspagescaling.ui settingspageprecision.ui qeditparametric.ui keditparametric.cpp qeditpolar.ui keditpolar.cpp editfunctionpage.ui editderivativespage.ui editintegralpage.ui editfunction.cpp qeditconstant.ui qminmax.ui kminmax.cpp qconstanteditor.ui keditconstant.cpp kmplotio.cpp sliderwindow.ui ksliderwindow.cpp MainDlgIface.skel parseriface.skel Viewiface.skel coordsconfigdialog.cpp
libkmplotpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-libkmplotpart_la_LIBADD = $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET) $(LIB_KDEPRINT)
+libkmplotpart_la_LIBADD = $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET) $(LIB_KDEPRINT) -lDCOP $(LIB_KPARTS)
# this is where the desktop file will go
partdesktopdir = $(kde_servicesdir)
diff -Nurd kdeedu-3.5.9/kmplot/kmplot/main.cpp kdeedu-3.5.9-new/kmplot/kmplot/main.cpp
--- kdeedu-3.5.9/kmplot/kmplot/main.cpp 2005-10-10 10:55:30.000000000 -0400
+++ kdeedu-3.5.9-new/kmplot/kmplot/main.cpp 2008-02-13 21:57:25.000000000 -0500
@@ -50,7 +50,7 @@
};
-int main( int argc, char **argv )
+extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
{
KAboutData aboutData(
"kmplot",
diff -Nurd kdeedu-3.5.9/kpercentage/kpercentage/Makefile.am kdeedu-3.5.9-new/kpercentage/kpercentage/Makefile.am
--- kdeedu-3.5.9/kpercentage/kpercentage/Makefile.am 2005-09-10 04:16:51.000000000 -0400
+++ kdeedu-3.5.9-new/kpercentage/kpercentage/Makefile.am 2008-02-13 21:57:25.000000000 -0500
@@ -1,6 +1,10 @@
-bin_PROGRAMS = kpercentage
-kpercentage_SOURCES = kanimation.cpp kanswer.cpp kpercentmain.cpp kpercentage.cpp ksplashscreen.cpp main.cpp
-kpercentage_LDADD = $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET)
+
+bin_PROGRAMS =
+lib_LTLIBRARIES =
+kdeinit_LTLIBRARIES = kpercentage.la
+
+kpercentage_la_SOURCES = kanimation.cpp kanswer.cpp kpercentmain.cpp kpercentage.cpp ksplashscreen.cpp main.cpp
+kpercentage_la_LIBADD = $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET)
SUBDIRS = icons pics
@@ -30,7 +34,7 @@
# the library search path.
-kpercentage_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kpercentage_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
stringstocpp:
diff -Nurd kdeedu-3.5.9/kpercentage/kpercentage/main.cpp kdeedu-3.5.9-new/kpercentage/kpercentage/main.cpp
--- kdeedu-3.5.9/kpercentage/kpercentage/main.cpp 2008-02-13 04:36:34.000000000 -0500
+++ kdeedu-3.5.9-new/kpercentage/kpercentage/main.cpp 2008-02-13 21:57:25.000000000 -0500
@@ -34,7 +34,7 @@
KCmdLineLastOption
};
-int main( int argc, char *argv[] )
+extern "C" KDE_EXPORT int kdemain( int argc, char *argv[] )
{
KAboutData aboutData
(
diff -Nurd kdeedu-3.5.10/kstars/kstars/Makefile.am kdeedu-3.5.10-new/kstars/kstars/Makefile.am
--- kdeedu-3.5.10/kstars/kstars/Makefile.am 2005-09-10 04:17:55.000000000 -0400
+++ kdeedu-3.5.10-new/kstars/kstars/Makefile.am 2010-07-21 16:28:55.000000000 -0400
@@ -1,6 +1,8 @@
-bin_PROGRAMS = kstars
+bin_PROGRAMS =
+lib_LTLIBRARIES =
+kdeinit_LTLIBRARIES = kstars.la
-kstars_SOURCES = addcatdialog.cpp addlinkdialog.cpp colorscheme.cpp \
+kstars_la_SOURCES = addcatdialog.cpp addlinkdialog.cpp colorscheme.cpp \
conbridlg.cpp csegment.cpp deepskyobject.cpp detaildialog.cpp devicemanager.cpp \
dms.cpp dmsbox.cpp filesource.cpp finddialog.cpp fitshistogram.cpp ccdpreviewwg.cpp customcatalog.cpp \
fitsimage.cpp fitsprocess.cpp fitsviewer.cpp focusdialog.cpp fov.cpp fovdialog.cpp \
@@ -28,13 +30,13 @@
kde_kcfg_DATA = kstars.kcfg
kde_conf_DATA = kstarsrc
-kstars_LDADD = indi/liblilxml.a indi/libindicom.a tools/libkstarstools.a $(top_builddir)/libkdeedu/kdeeduplot/libkdeeduplot.la $(top_builddir)/libkdeedu/kdeeduui/libkdeeduui.la $(top_builddir)/libkdeedu/extdate/libextdate.la -lkdeprint -lknewstuff -lm -lz
+kstars_la_LIBADD = indi/liblilxml.a indi/libindicom.a tools/libkstarstools.a $(top_builddir)/libkdeedu/kdeeduplot/libkdeeduplot.la $(top_builddir)/libkdeedu/kdeeduui/libkdeeduui.la $(top_builddir)/libkdeedu/extdate/libextdate.la -lkdeprint -lknewstuff -lm -lz -lDCOP -lkdefx
SUBDIRS = indi tools . data icons
KDE_ICON=AUTO
-kstars_COMPILE_FIRST = Options.kcfgc
+kstars_la_COMPILE_FIRST = Options.kcfgc
EXTRA_DIST = kstars.desktop kstarsui.rc fitsviewer.rc
@@ -54,7 +56,7 @@
METASOURCES = AUTO
# the library search path.
-kstars_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kstars_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
# Uncomment the following two lines if you add a ui.rc file for your application to make use of
# KDE
diff -Nurd kdeedu-3.5.9/kstars/kstars/indi/apmount.cpp kdeedu-3.5.9-new/kstars/kstars/indi/apmount.cpp
--- kdeedu-3.5.9/kstars/kstars/indi/apmount.cpp 2005-10-10 10:55:39.000000000 -0400
+++ kdeedu-3.5.9-new/kstars/kstars/indi/apmount.cpp 2008-02-13 21:57:25.000000000 -0500
@@ -39,8 +39,9 @@
*/
-#if !(TIMEZONE_IS_INT)
-static int daylight = 0;
+/* FIXME: hack!, make a real test for extern int daylight on darwin */
+#if !(TIMEZONE_IS_INT) || defined(__APPLE__)
+int daylight = 0;
#endif
static inline double timezoneOffset()
diff -Nurd kdeedu-3.5.9/kstars/kstars/indi/fli_ccd.c kdeedu-3.5.9-new/kstars/kstars/indi/fli_ccd.c
--- kdeedu-3.5.9/kstars/kstars/indi/fli_ccd.c 2005-10-10 10:55:39.000000000 -0400
+++ kdeedu-3.5.9-new/kstars/kstars/indi/fli_ccd.c 2008-02-13 21:57:25.000000000 -0500
@@ -19,6 +19,7 @@
#endif
+#include
#include
#include
#include
diff -Nurd kdeedu-3.5.9/kstars/kstars/indi/lx200generic.cpp kdeedu-3.5.9-new/kstars/kstars/indi/lx200generic.cpp
--- kdeedu-3.5.9/kstars/kstars/indi/lx200generic.cpp 2005-10-10 10:55:39.000000000 -0400
+++ kdeedu-3.5.9-new/kstars/kstars/indi/lx200generic.cpp 2008-02-13 21:57:25.000000000 -0500
@@ -41,7 +41,7 @@
#if !(TIMEZONE_IS_INT)
-static int daylight = 0;
+int daylight = 0;
#endif
static inline double timezoneOffset()
diff -Nurd kdeedu-3.5.9/kstars/kstars/indi/webcam/Makefile.am kdeedu-3.5.9-new/kstars/kstars/indi/webcam/Makefile.am
--- kdeedu-3.5.9/kstars/kstars/indi/webcam/Makefile.am 2005-09-10 04:17:35.000000000 -0400
+++ kdeedu-3.5.9-new/kstars/kstars/indi/webcam/Makefile.am 2008-02-13 21:57:25.000000000 -0500
@@ -1,7 +1,7 @@
if HAVE_V4L2
libwebcam_linux = libwebcam_v4l2_linux.la
else
- libwebcam_linux = libwebcam_v4l1_linux.la
+ libwebcam_linux =
endif
noinst_LTLIBRARIES = libwebcam.la $(libwebcam_linux)
diff -Nurd kdeedu-3.5.9/kstars/kstars/main.cpp kdeedu-3.5.9-new/kstars/kstars/main.cpp
--- kdeedu-3.5.9/kstars/kstars/main.cpp 2008-02-13 04:36:37.000000000 -0500
+++ kdeedu-3.5.9-new/kstars/kstars/main.cpp 2008-02-13 21:57:25.000000000 -0500
@@ -49,7 +49,7 @@
KCmdLineLastOption
};
-int main(int argc, char *argv[])
+extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
{
KAboutData aboutData( "kstars", I18N_NOOP("KStars"),
KSTARS_VERSION, description, KAboutData::License_GPL,
diff -Nurd kdeedu-3.5.10/ktouch/src/Makefile.am kdeedu-3.5.10-new/ktouch/src/Makefile.am
--- kdeedu-3.5.10/ktouch/src/Makefile.am 2006-05-22 14:03:38.000000000 -0400
+++ kdeedu-3.5.10-new/ktouch/src/Makefile.am 2010-07-21 16:37:50.000000000 -0400
@@ -26,7 +26,7 @@
ktouchstatistics.h ktouchstatus.h ktouchtrainer.h ktouchutils.h ktouchcoloreditor.h
# let automoc handle all of the meta source files (moc)
-ktouch_METASOURCES = AUTO
+ktouch_la_METASOURCES = AUTO
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/ktouch.pot
@@ -37,10 +37,12 @@
#########################################################################
# this is the program that gets installed. it's name is used for all
# of the other Makefile.am variables
-bin_PROGRAMS = ktouch
+bin_PROGRAMS =
+lib_LTLIBRARIES =
+kdeinit_LTLIBRARIES = ktouch.la
# the application source, library search path, and link libraries
-ktouch_SOURCES = ktouchchartwidget.cpp ktouchcoloreditor_dlg.ui \
+ktouch_la_SOURCES = ktouchchartwidget.cpp ktouchcoloreditor_dlg.ui \
ktouchcolorscheme.cpp ktouch.cpp ktouchdefaults.cpp ktouchkeyboardwidget.cpp \
ktouchkeyconnector.cpp ktouchkey.cpp ktouchkeys.cpp ktouchlecture.cpp ktouchlectureeditor.cpp \
ktouchlectureeditor_dlg.ui ktouchleveldata.cpp ktouchopenrequest.cpp ktouchopenrequest_dlg.ui \
@@ -50,11 +52,11 @@
ktouchutils.cpp main.cpp prefs.kcfgc ktouchcoloreditor.cpp
# the library search path.
-ktouch_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+ktouch_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(KDE_PLUGIN) -module
# the libraries to link against. Be aware of the order. First the libraries,
# that depend on the following ones.
-ktouch_LDADD = ../../libkdeedu/kdeeduplot/libkdeeduplot.la $(LIB_KIO)
+ktouch_la_LIBADD = ../../libkdeedu/kdeeduplot/libkdeeduplot.la $(LIB_KIO) $(LIB_KDEUI)
rcdir = $(kde_datadir)/ktouch
rc_DATA = ktouchui.rc
diff -Nurd kdeedu-3.5.9/ktouch/src/main.cpp kdeedu-3.5.9-new/ktouch/src/main.cpp
--- kdeedu-3.5.9/ktouch/src/main.cpp 2006-05-22 14:03:38.000000000 -0400
+++ kdeedu-3.5.9-new/ktouch/src/main.cpp 2008-02-13 21:57:25.000000000 -0500
@@ -26,7 +26,7 @@
KCmdLineLastOption
};
-int main(int argc, char **argv)
+extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
{
KAboutData about("ktouch",
I18N_NOOP("KTouch"),
diff -Nurd kdeedu-3.5.10/kturtle/src/Makefile.am kdeedu-3.5.10-new/kturtle/src/Makefile.am
--- kdeedu-3.5.10/kturtle/src/Makefile.am 2005-09-10 04:16:51.000000000 -0400
+++ kdeedu-3.5.10-new/kturtle/src/Makefile.am 2010-07-21 16:36:24.000000000 -0400
@@ -6,20 +6,22 @@
# added from kjots
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-kturtle_LDFLAGS = $(KDE_RPATH) $(all_libraries)
-kturtle_LDADD = $(LIB_KDEUI) $(LIB_KIO) $(LIB_KDEPRINT) $(LIB_KPARTS) -lkatepartinterfaces
+kturtle_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -module
+kturtle_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIB_KDEPRINT) $(LIB_KPARTS) -lkatepartinterfaces $(LIB_QT) $(LIB_KDECORE) -lktexteditor
KDE_ICON = kturtle
# this is the program that gets installed. it's name is used for all
# of the other Makefile.am variables
-bin_PROGRAMS = kturtle
+bin_PROGRAMS =
+lib_LTLIBRARIES =
+kdeinit_LTLIBRARIES = kturtle.la
# the application source, library search path, and link libraries
-kturtle_SOURCES = main.cpp kturtle.cpp canvas.cpp dialogs.cpp value.cpp lexer.cpp parser.cpp executer.cpp treenode.cpp token.cpp translate.cpp settings.kcfgc
+kturtle_la_SOURCES = main.cpp kturtle.cpp canvas.cpp dialogs.cpp value.cpp lexer.cpp parser.cpp executer.cpp treenode.cpp token.cpp translate.cpp settings.kcfgc
# let automoc handle all the meta source files (moc)
-kturtle_METASOURCES = AUTO
+kturtle_la_METASOURCES = AUTO
# these are the headers for your project
noinst_HEADERS = kturtle.h canvas.h dialogs.cpp value.h lexer.h parser.h executer.h treenode.h token.h translate.h
diff -Nurd kdeedu-3.5.9/kturtle/src/main.cpp kdeedu-3.5.9-new/kturtle/src/main.cpp
--- kdeedu-3.5.9/kturtle/src/main.cpp 2005-10-10 10:55:19.000000000 -0400
+++ kdeedu-3.5.9-new/kturtle/src/main.cpp 2008-02-13 21:57:25.000000000 -0500
@@ -43,7 +43,7 @@
};
-int main(int argc, char **argv)
+extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
{
KAboutData about("kturtle", I18N_NOOP("KTurtle"), version, description, KAboutData::License_GPL, copyright, 0, website);
about.addAuthor("Cies Breijs",
diff -Nurd kdeedu-3.5.10/kverbos/kverbos/Makefile.am kdeedu-3.5.10-new/kverbos/kverbos/Makefile.am
--- kdeedu-3.5.10/kverbos/kverbos/Makefile.am 2005-09-10 04:17:22.000000000 -0400
+++ kdeedu-3.5.10-new/kverbos/kverbos/Makefile.am 2010-07-21 16:34:04.000000000 -0400
@@ -1,8 +1,11 @@
SUBDIRS = icons data
-bin_PROGRAMS = kverbos
-kverbos_SOURCES = kfeedercontrol.cpp kresult.cpp qresult.ui verbspanish.cpp kverbosuser.cpp kerfassen.cpp qerfassen.ui kverbedit.cpp qverbedit.ui qverbosoptions.ui kverbosoptions.cpp qlernen.ui kstartuplogo.cpp kverbosview.cpp kverbosdoc.cpp kverbos.cpp main.cpp prefs.kcfgc
-kverbos_LDADD = $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET)
+bin_PROGRAMS =
+lib_LTLIBRARIES =
+kdeinit_LTLIBRARIES = kverbos.la
+
+kverbos_la_SOURCES = kfeedercontrol.cpp kresult.cpp qresult.ui verbspanish.cpp kverbosuser.cpp kerfassen.cpp qerfassen.ui kverbedit.cpp qverbedit.ui qverbosoptions.ui kverbosoptions.cpp qlernen.ui kstartuplogo.cpp kverbosview.cpp kverbosdoc.cpp kverbos.cpp main.cpp prefs.kcfgc
+kverbos_la_LIBADD = $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET) -lDCOP
EXTRA_DIST = kfeedercontrol.cpp kfeedercontrol.h main.cpp kverbos.cpp kverbos.h kverbosdoc.cpp kverbosdoc.h kverbosview.cpp kverbosview.h kverbosui.rc kverbos.desktop kstartuplogo.cpp kstartuplogo.h startuplogo.png qlernen.ui kverbosoptions.cpp kverbosoptions.h qverbosoptions.ui qverbedit.ui kverbedit.cpp kverbedit.h qerfassen.ui kerfassen.cpp kerfassen.h deu16.png span16.png kverbosuser.cpp kverbosuser.h verbspanish.cpp verbspanish.h qresult.ui kverbosuser.png kresult.cpp kresult.h
@@ -19,7 +22,7 @@
METASOURCES = AUTO
# the library search path.
-kverbos_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kverbos_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
rcdir = $(kde_datadir)/kverbos
rc_DATA = kverbosui.rc
diff -Nurd kdeedu-3.5.9/kverbos/kverbos/main.cpp kdeedu-3.5.9-new/kverbos/kverbos/main.cpp
--- kdeedu-3.5.9/kverbos/kverbos/main.cpp 2005-09-10 04:17:22.000000000 -0400
+++ kdeedu-3.5.9-new/kverbos/kverbos/main.cpp 2008-02-13 21:57:25.000000000 -0500
@@ -32,7 +32,7 @@
-int main(int argc, char *argv[])
+extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
{
KAboutData aboutData( "kverbos", I18N_NOOP("KVerbos"),
diff -Nurd kdeedu-3.5.10/kvoctrain/kvoctrain/Makefile.am kdeedu-3.5.10-new/kvoctrain/kvoctrain/Makefile.am
--- kdeedu-3.5.10/kvoctrain/kvoctrain/Makefile.am 2007-10-08 05:48:17.000000000 -0400
+++ kdeedu-3.5.10-new/kvoctrain/kvoctrain/Makefile.am 2010-07-21 16:49:04.000000000 -0400
@@ -8,12 +8,12 @@
spotlight2kvtml_SOURCES = spotlight2kvtml.cpp
-spotlight2kvtml_LDADD = $(LIB_KDECORE)
+spotlight2kvtml_LDADD = $(LIB_KDECORE) $(LIB_QT)
kvoctrain_LDADD = ./docprop-dialogs/libdocpropdlg.la \
./entry-dialogs/libentrydlg.la ./kvt-core/libkvoctraincore.la ./kvt-core/kvt-xml/libkvtxml.la \
./query-dialogs/libquerydlg.la ./statistik-dialogs/libstatdlg.la ./common-dialogs/libcommondlg.la \
- -lknewstuff $(LIB_KDEPRINT)
+ -lknewstuff $(LIB_KDEPRINT) $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) -lDCOP $(LIB_KIO)
EXTRA_DIST = kvoctrainui.rc
diff -Nurd kdeedu-3.5.9/kwordquiz/src/Makefile.am kdeedu-3.5.9-new/kwordquiz/src/Makefile.am
--- kdeedu-3.5.9/kwordquiz/src/Makefile.am 2007-05-14 03:38:51.000000000 -0400
+++ kdeedu-3.5.9-new/kwordquiz/src/Makefile.am 2008-02-13 21:57:25.000000000 -0500
@@ -1,9 +1,11 @@
####### kdevelop will overwrite this part!!! (begin)##########
-bin_PROGRAMS = kwordquiz
+bin_PROGRAMS =
+lib_LTLIBRARIES =
+kdeinit_LTLIBRARIES = kwordquiz.la
## INCLUDES were found outside kdevelop specific part
-kwordquiz_SOURCES = kwordquizprefs.cpp kwordquizview.cpp kwordquizdoc.cpp \
+kwordquiz_la_SOURCES = kwordquizprefs.cpp kwordquizview.cpp kwordquizdoc.cpp \
kwordquiz.cpp main.cpp dlglanguagebase.ui flashviewbase.ui multipleviewbase.ui \
qaviewbase.ui qaview.cpp flashview.cpp multipleview.cpp wqquiz.cpp wqlistitem.cpp \
wqscore.cpp keduvocdata.cpp prefeditorbase.ui prefquizbase.ui prefeditor.cpp \
@@ -11,7 +13,7 @@
kvtmlwriter.cpp dlglanguage.cpp wqprintdialogpage.cpp prefcharacter.cpp \
prefcharacterbase.ui paukerreader.cpp wqlreader.cpp wqlwriter.cpp wqundo.cpp prefs.kcfgc \
prefcardappearance.cpp prefcardappearancebase.ui kwqnewstuff.cpp kwqnewstuff.h
-kwordquiz_LDADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) \
+kwordquiz_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) \
$(LIBSOCKET) $(LIB_KDEPRINT) -lknewstuff
@@ -50,7 +52,7 @@
METASOURCES = AUTO
# the library search path.
-kwordquiz_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kwordquiz_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
rcdir = $(kde_datadir)/kwordquiz
rc_DATA = kwordquizui.rc eventsrc
diff -Nurd kdeedu-3.5.9/kwordquiz/src/main.cpp kdeedu-3.5.9-new/kwordquiz/src/main.cpp
--- kdeedu-3.5.9/kwordquiz/src/main.cpp 2005-10-10 10:55:21.000000000 -0400
+++ kdeedu-3.5.9-new/kwordquiz/src/main.cpp 2008-02-13 21:57:25.000000000 -0500
@@ -33,7 +33,7 @@
{ 0, 0, 0 }
};
-int main(int argc, char *argv[])
+extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
{
KAboutData aboutData("kwordquiz",
I18N_NOOP("KWordQuiz"),
diff -Nurd kdeedu-3.5.10/libkdeedu/extdate/Makefile.am kdeedu-3.5.10-new/libkdeedu/extdate/Makefile.am
--- kdeedu-3.5.10/libkdeedu/extdate/Makefile.am 2008-08-19 14:11:46.000000000 -0400
+++ kdeedu-3.5.10-new/libkdeedu/extdate/Makefile.am 2010-07-21 14:42:36.000000000 -0400
@@ -7,7 +7,7 @@
libextdate_la_SOURCES = extdatetime.cpp extcalendarsystem.cpp extcalendarsystemgregorian.cpp extdatetbl.cpp extdatepicker.cpp extdatetimeedit.cpp extdatewidget.cpp
libextdate_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
-libextdate_la_LIBADD = $(LIB_KDEUI)
+libextdate_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
test_extdate_SOURCES = test_extdate.cc
test_extdate_LDADD = libextdate.la
diff -Nurd kdeedu-3.5.10/libkdeedu/kdeeducore/Makefile.am kdeedu-3.5.10-new/libkdeedu/kdeeducore/Makefile.am
--- kdeedu-3.5.10/libkdeedu/kdeeducore/Makefile.am 2005-09-10 04:16:50.000000000 -0400
+++ kdeedu-3.5.10-new/libkdeedu/kdeeducore/Makefile.am 2010-07-21 14:35:13.000000000 -0400
@@ -11,7 +11,7 @@
libkdeeducode_includedir = $(includedir)/libkdeedu
libkdeeducode_include_HEADERS = keduvocdata.h
-libkdeeducore_la_LIBADD = $(LIB_KDECORE)
+libkdeeducore_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)
METASOURCES = AUTO
diff -Nurd kdeedu-3.5.10/libkdeedu/kdeeduui/Makefile.am kdeedu-3.5.10-new/libkdeedu/kdeeduui/Makefile.am
--- kdeedu-3.5.10/libkdeedu/kdeeduui/Makefile.am 2005-09-10 04:16:50.000000000 -0400
+++ kdeedu-3.5.10-new/libkdeedu/kdeeduui/Makefile.am 2010-07-21 14:46:40.000000000 -0400
@@ -10,7 +10,7 @@
libkdeeduuiinclude_HEADERS = kdeeduglossary.h
libkdeeduui_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:5:0
-libkdeeduui_la_LIBADD = $(LIB_KDECORE) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KHTML)
+libkdeeduui_la_LIBADD = $(LIB_KDECORE) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KHTML) $(LIB_QT)
METASOURCES = AUTO