Hi, I've made a diff from kdeedu/kiten/Makefile.am against HEAD for the branch to replace the kdeedu/debian/patches/modules.diff patch - if dirk says it's Ok then I would apply this to the branch directly and we can drop the debian specific patch. Ralf -- We're not a company, we just produce better code at less costs. -------------------------------------------------------------------- Ralf Nolden nolden@kde.org The K Desktop Environment The KDevelop Project http://www.kde.org http://www.kdevelop.org
--- kdeedu.old/kiten/Makefile.am Fri Jul 26 09:41:41 2002 +++ kdeedu/kiten/Makefile.am Sun Sep 14 09:23:33 2003 @@ -2,9 +2,7 @@ SUBDIRS = pics -lib_LTLIBRARIES = kiten.la - -kiten_la_SOURCES = main.cpp \ +kiten_SOURCES = main.cpp \ dict.cpp \ kiten.cpp \ optiondialog.cpp \ @@ -16,16 +14,14 @@ kloader.cpp \ ksaver.cpp -kiten_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version +kiten_LDFLAGS = $(all_libraries) $(KDE_RPATH) +kiten_LDADD = $(LIB_KDEPRINT) $(LIB_KIO) bin_PROGRAMS = kiten kitengen -kiten_LDADD = kiten.la $(KDE_RPATH) $(LIB_KDEUI) $(LIB_KIO) $(LIB_KDEPRINT) -kiten_LDFLAGS = $(all_libraries) -kiten_SOURCES = dummy.cpp - kitengen_SOURCES = xjdxgen.c -kitengen_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) +kitengen_LDFLAGS = $(all_libraries) $(KDE_RPATH) +kitengen_LDADD = $(LIB_QT) METASOURCES = AUTO @@ -34,14 +30,11 @@ rcdir = $(kde_datadir)/kiten rc_DATA = kitenui.rc learnui.rc eeditui.rc -dummy.cpp: - echo > dummy.cpp - applnk_DATA = kiten.desktop applnkdir = $(kde_appsdir)/Edutainment/Languages -data_DATA = edict kanjidic radkfile vconj romkana.cnv -datadir = $(kde_datadir)/kiten +kiten_DATA = edict kanjidic radkfile vconj romkana.cnv +kitendir = $(kde_datadir)/kiten messages: rc.cpp $(XGETTEXT) *.cpp *.h -o $(podir)/kiten.pot
Attachment:
pgpp35RKYqTbC.pgp
Description: signature