Many bugfixes and functionality enhancements including: General New default widget style: Keramik New default icon theme: Crystal Created and enhanced framework to effectively disable certain features of the GUI, like for example shell access, disallowing to select custom wall papers. "Kiosk mode" Usability improvements: Kicker: Context menu, applet menus, wording and panel feature consistency improved Kicker: Redesigned control module. KCalc: Usability Improvements. KSnapshot: Usability Improvements. KsCD: User Interface Improvements in configuration and information dialogs kdelibs Extended the DCOP commandline client to enable nonGUI applications (such as shell scripts) to use DCOP send DCOP messages to multiple users and/or sessions concurrently Added to notification dialog to allow applications to configure their notifications with a common GUI. Added "Open File", "Open Destination" and "Keep window open" to download progress dialog. KDatePicker has now week number display and selection. Added KLocale support for setting/retrieving the first day of a week Support for "Multimedia keys" on your keyboard. Added on-demand icon loading support to improve startup performance of applications. KHTML: Improvements to printing support. Page Info and Frame info dialog. Auto-Scroll support of webpages using Shift combined with arrow keys. Many, many Bugfixes and improvements. Small codebase merges with Safari. The main merge is planned for a future release however, as it requires more testing. KIO: Modified thumbnail ioslave that can extract a thumbnail from the file directly if it contains one, rather than generating one itself. Added fish:// protocol slave, which can access remote filesystems via SSH and SCP Cleanups and Corrections in smtp:// protocol slave. Activated rtsp:// protocol slave. Added support for Public Key Authentication and interopability with newer versions of OpenSSH to sftp:// protocol slave. KSSL: SSL certificate policies can now be configured based on the host name
333 lines
18 KiB
Text
333 lines
18 KiB
Text
$NetBSD: patch-ap,v 1.4 2003/03/11 13:10:35 markd Exp $
|
|
|
|
--- kded/Makefile.in.orig Thu Jan 23 12:30:35 2003
|
|
+++ kded/Makefile.in
|
|
@@ -303,18 +303,22 @@
|
|
|
|
INCLUDES = -I$(srcdir)/.. -I$(top_srcdir) $(all_includes)
|
|
|
|
-lib_LTLIBRARIES = kded.la kbuildsycoca.la
|
|
+lib_LTLIBRARIES = libkded_main.la kded.la libkbuildsycoca_main.la kbuildsycoca.la
|
|
|
|
-kded_la_LDFLAGS = $(all_libraries) -module -avoid-version
|
|
-kded_la_LIBADD = $(LIB_KIO)
|
|
-kded_la_SOURCES = kded.cpp kbuildservicetypefactory.cpp \
|
|
+libkded_main_la_LDFLAGS = $(all_libraries)
|
|
+libkded_main_la_LIBADD = $(LIB_KIO)
|
|
+libkded_main_la_SOURCES = kded.cpp kbuildservicetypefactory.cpp \
|
|
kbuildservicefactory.cpp \
|
|
kbuildservicegroupfactory.cpp kdedmodule.cpp
|
|
|
|
|
|
-kbuildsycoca_la_LDFLAGS = $(all_libraries) -module -avoid-version
|
|
-kbuildsycoca_la_LIBADD = $(LIB_KIO)
|
|
-kbuildsycoca_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp \
|
|
+kded_la_LDFLAGS = $(all_libraries) -module -avoid-version
|
|
+kded_la_LIBADD = libkded_main.la
|
|
+kded_la_SOURCES = kded_main.cpp
|
|
+
|
|
+libkbuildsycoca_main_la_LDFLAGS = $(all_libraries)
|
|
+libkbuildsycoca_main_la_LIBADD = $(LIB_KIO)
|
|
+libkbuildsycoca_main_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp \
|
|
kbuildservicefactory.cpp \
|
|
kbuildservicegroupfactory.cpp \
|
|
kbuildimageiofactory.cpp \
|
|
@@ -322,15 +326,19 @@
|
|
kctimefactory.cpp
|
|
|
|
|
|
+kbuildsycoca_la_LDFLAGS = $(all_libraries) -module -avoid-version
|
|
+kbuildsycoca_la_LIBADD = libkbuildsycoca_main.la
|
|
+kbuildsycoca_la_SOURCES = kbuildsycoca_main.cpp
|
|
+
|
|
bin_PROGRAMS = kded kbuildsycoca kdontchangethehostname
|
|
|
|
kded_LDFLAGS = $(all_libraries) $(KDE_RPATH)
|
|
-kded_LDADD = kded.la
|
|
-kded_SOURCES = dummy.cpp
|
|
+kded_LDADD = libkded_main.la
|
|
+kded_SOURCES = kded_main.cpp
|
|
|
|
kbuildsycoca_LDFLAGS = $(all_libraries) $(KDE_RPATH)
|
|
-kbuildsycoca_LDADD = kbuildsycoca.la
|
|
-kbuildsycoca_SOURCES = dummy.cpp
|
|
+kbuildsycoca_LDADD = libkbuildsycoca_main.la
|
|
+kbuildsycoca_SOURCES = kbuildsycoca_main.cpp
|
|
|
|
kdontchangethehostname_LDFLAGS = $(all_libraries) $(KDE_RPATH)
|
|
kdontchangethehostname_LDADD = $(LIB_KDECORE)
|
|
@@ -357,46 +365,56 @@
|
|
CONFIG_CLEAN_FILES =
|
|
LTLIBRARIES = $(lib_LTLIBRARIES)
|
|
|
|
-kbuildsycoca_la_DEPENDENCIES =
|
|
-am_kbuildsycoca_la_OBJECTS = kbuildsycoca.lo kbuildservicetypefactory.lo \
|
|
- kbuildservicefactory.lo kbuildservicegroupfactory.lo \
|
|
- kbuildimageiofactory.lo kbuildprotocolinfofactory.lo \
|
|
- kctimefactory.lo
|
|
+kbuildsycoca_la_DEPENDENCIES = libkbuildsycoca_main.la
|
|
+am_kbuildsycoca_la_OBJECTS = kbuildsycoca_main.lo
|
|
#>- kbuildsycoca_la_OBJECTS = $(am_kbuildsycoca_la_OBJECTS)
|
|
+#>+ 1
|
|
+kbuildsycoca_la_OBJECTS = kbuildsycoca_main.lo
|
|
+kded_la_DEPENDENCIES = libkded_main.la
|
|
+am_kded_la_OBJECTS = kded_main.lo
|
|
+#>- kded_la_OBJECTS = $(am_kded_la_OBJECTS)
|
|
+#>+ 1
|
|
+kded_la_OBJECTS = kded_main.lo
|
|
+libkbuildsycoca_main_la_DEPENDENCIES =
|
|
+am_libkbuildsycoca_main_la_OBJECTS = kbuildsycoca.lo \
|
|
+ kbuildservicetypefactory.lo kbuildservicefactory.lo \
|
|
+ kbuildservicegroupfactory.lo kbuildimageiofactory.lo \
|
|
+ kbuildprotocolinfofactory.lo kctimefactory.lo
|
|
+#>- libkbuildsycoca_main_la_OBJECTS = $(am_libkbuildsycoca_main_la_OBJECTS)
|
|
#>+ 7
|
|
-kbuildsycoca_la_final_OBJECTS = kbuildsycoca_la.all_cpp.lo
|
|
-kbuildsycoca_la_nofinal_OBJECTS = kbuildsycoca.lo kbuildservicetypefactory.lo \
|
|
- kbuildservicefactory.lo kbuildservicegroupfactory.lo \
|
|
- kbuildimageiofactory.lo kbuildprotocolinfofactory.lo \
|
|
- kctimefactory.lo
|
|
-@KDE_USE_FINAL_FALSE@kbuildsycoca_la_OBJECTS = $(kbuildsycoca_la_nofinal_OBJECTS)
|
|
-@KDE_USE_FINAL_TRUE@kbuildsycoca_la_OBJECTS = $(kbuildsycoca_la_final_OBJECTS)
|
|
-kded_la_DEPENDENCIES =
|
|
-am_kded_la_OBJECTS = kded.lo kbuildservicetypefactory.lo \
|
|
+libkbuildsycoca_main_la_final_OBJECTS = libkbuildsycoca_main_la.all_cpp.lo
|
|
+libkbuildsycoca_main_la_nofinal_OBJECTS = kbuildsycoca.lo \
|
|
+ kbuildservicetypefactory.lo kbuildservicefactory.lo \
|
|
+ kbuildservicegroupfactory.lo kbuildimageiofactory.lo \
|
|
+ kbuildprotocolinfofactory.lo kctimefactory.lo
|
|
+@KDE_USE_FINAL_FALSE@libkbuildsycoca_main_la_OBJECTS = $(libkbuildsycoca_main_la_nofinal_OBJECTS)
|
|
+@KDE_USE_FINAL_TRUE@libkbuildsycoca_main_la_OBJECTS = $(libkbuildsycoca_main_la_final_OBJECTS)
|
|
+libkded_main_la_DEPENDENCIES =
|
|
+am_libkded_main_la_OBJECTS = kded.lo kbuildservicetypefactory.lo \
|
|
kbuildservicefactory.lo kbuildservicegroupfactory.lo \
|
|
kdedmodule.lo
|
|
-#>- kded_la_OBJECTS = $(am_kded_la_OBJECTS)
|
|
+#>- libkded_main_la_OBJECTS = $(am_libkded_main_la_OBJECTS)
|
|
#>+ 6
|
|
-kded_la_final_OBJECTS = kded_la.all_cpp.lo
|
|
-kded_la_nofinal_OBJECTS = kded.lo kbuildservicetypefactory.lo \
|
|
+libkded_main_la_final_OBJECTS = libkded_main_la.all_cpp.lo
|
|
+libkded_main_la_nofinal_OBJECTS = kded.lo kbuildservicetypefactory.lo \
|
|
kbuildservicefactory.lo kbuildservicegroupfactory.lo \
|
|
kdedmodule.lo
|
|
-@KDE_USE_FINAL_FALSE@kded_la_OBJECTS = $(kded_la_nofinal_OBJECTS)
|
|
-@KDE_USE_FINAL_TRUE@kded_la_OBJECTS = $(kded_la_final_OBJECTS)
|
|
+@KDE_USE_FINAL_FALSE@libkded_main_la_OBJECTS = $(libkded_main_la_nofinal_OBJECTS)
|
|
+@KDE_USE_FINAL_TRUE@libkded_main_la_OBJECTS = $(libkded_main_la_final_OBJECTS)
|
|
bin_PROGRAMS = kded$(EXEEXT) kbuildsycoca$(EXEEXT) \
|
|
kdontchangethehostname$(EXEEXT)
|
|
PROGRAMS = $(bin_PROGRAMS)
|
|
|
|
-am_kbuildsycoca_OBJECTS = dummy.$(OBJEXT)
|
|
+am_kbuildsycoca_OBJECTS = kbuildsycoca_main.$(OBJEXT)
|
|
#>- kbuildsycoca_OBJECTS = $(am_kbuildsycoca_OBJECTS)
|
|
#>+ 1
|
|
-kbuildsycoca_OBJECTS = dummy.$(OBJEXT)
|
|
-kbuildsycoca_DEPENDENCIES = kbuildsycoca.la
|
|
-am_kded_OBJECTS = dummy.$(OBJEXT)
|
|
+kbuildsycoca_OBJECTS = kbuildsycoca_main.$(OBJEXT)
|
|
+kbuildsycoca_DEPENDENCIES = libkbuildsycoca_main.la
|
|
+am_kded_OBJECTS = kded_main.$(OBJEXT)
|
|
#>- kded_OBJECTS = $(am_kded_OBJECTS)
|
|
#>+ 1
|
|
-kded_OBJECTS = dummy.$(OBJEXT)
|
|
-kded_DEPENDENCIES = kded.la
|
|
+kded_OBJECTS = kded_main.$(OBJEXT)
|
|
+kded_DEPENDENCIES = libkded_main.la
|
|
am_kdontchangethehostname_OBJECTS = khostname.$(OBJEXT)
|
|
#>- kdontchangethehostname_OBJECTS = $(am_kdontchangethehostname_OBJECTS)
|
|
#>+ 1
|
|
@@ -410,33 +428,39 @@
|
|
LIBS = @LIBS@
|
|
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
|
|
am__depfiles_maybe = depfiles
|
|
-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po \
|
|
-#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbuildimageiofactory.Plo \
|
|
+#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kbuildimageiofactory.Plo \
|
|
#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbuildprotocolinfofactory.Plo \
|
|
#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbuildservicefactory.Plo \
|
|
#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbuildservicegroupfactory.Plo \
|
|
#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbuildservicetypefactory.Plo \
|
|
#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbuildsycoca.Plo \
|
|
+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbuildsycoca_main.Plo \
|
|
+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbuildsycoca_main.Po \
|
|
#>- @AMDEP_TRUE@ ./$(DEPDIR)/kctimefactory.Plo ./$(DEPDIR)/kded.Plo \
|
|
+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kded_main.Plo ./$(DEPDIR)/kded_main.Po \
|
|
#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdedmodule.Plo ./$(DEPDIR)/khostname.Po
|
|
-#>+ 19
|
|
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kbuildsycoca_la.all_cpp.P $(DEPDIR)/kded_la.all_cpp.P ./$(DEPDIR)/dummy.Po \
|
|
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildimageiofactory.Plo \
|
|
+#>+ 23
|
|
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/libkbuildsycoca_main_la.all_cpp.P $(DEPDIR)/libkded_main_la.all_cpp.P ./$(DEPDIR)/kbuildimageiofactory.Plo \
|
|
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildprotocolinfofactory.Plo \
|
|
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildservicefactory.Plo \
|
|
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildservicegroupfactory.Plo \
|
|
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildservicetypefactory.Plo \
|
|
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildsycoca.Plo \
|
|
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildsycoca_main.Plo \
|
|
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildsycoca_main.Po \
|
|
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kctimefactory.Plo ./$(DEPDIR)/kded.Plo \
|
|
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kded_main.Plo ./$(DEPDIR)/kded_main.Po \
|
|
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdedmodule.Plo ./$(DEPDIR)/khostname.Po
|
|
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = ./$(DEPDIR)/dummy.Po \
|
|
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildimageiofactory.Plo \
|
|
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = ./$(DEPDIR)/kbuildimageiofactory.Plo \
|
|
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildprotocolinfofactory.Plo \
|
|
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildservicefactory.Plo \
|
|
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildservicegroupfactory.Plo \
|
|
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildservicetypefactory.Plo \
|
|
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildsycoca.Plo \
|
|
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildsycoca_main.Plo \
|
|
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildsycoca_main.Po \
|
|
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kctimefactory.Plo ./$(DEPDIR)/kded.Plo \
|
|
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kded_main.Plo ./$(DEPDIR)/kded_main.Po \
|
|
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdedmodule.Plo ./$(DEPDIR)/khostname.Po
|
|
|
|
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
|
|
@@ -459,6 +483,7 @@
|
|
$(AM_LDFLAGS) $(LDFLAGS) -o $@
|
|
CXXFLAGS = @CXXFLAGS@
|
|
DIST_SOURCES = $(kbuildsycoca_la_SOURCES) $(kded_la_SOURCES) \
|
|
+ $(libkbuildsycoca_main_la_SOURCES) $(libkded_main_la_SOURCES) \
|
|
$(kbuildsycoca_SOURCES) $(kded_SOURCES) \
|
|
$(kdontchangethehostname_SOURCES)
|
|
DATA = $(servicetype_DATA) $(update_DATA)
|
|
@@ -467,7 +492,7 @@
|
|
|
|
DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) Makefile.am \
|
|
Makefile.in
|
|
-SOURCES = $(kbuildsycoca_la_SOURCES) $(kded_la_SOURCES) $(kbuildsycoca_SOURCES) $(kded_SOURCES) $(kdontchangethehostname_SOURCES)
|
|
+SOURCES = $(kbuildsycoca_la_SOURCES) $(kded_la_SOURCES) $(libkbuildsycoca_main_la_SOURCES) $(libkded_main_la_SOURCES) $(kbuildsycoca_SOURCES) $(kded_SOURCES) $(kdontchangethehostname_SOURCES)
|
|
|
|
#>- all: all-am
|
|
#>+ 1
|
|
@@ -516,6 +541,10 @@
|
|
$(CXXLINK) -rpath $(libdir) $(kbuildsycoca_la_LDFLAGS) $(kbuildsycoca_la_OBJECTS) $(kbuildsycoca_la_LIBADD) $(LIBS)
|
|
kded.la: $(kded_la_OBJECTS) $(kded_la_DEPENDENCIES)
|
|
$(CXXLINK) -rpath $(libdir) $(kded_la_LDFLAGS) $(kded_la_OBJECTS) $(kded_la_LIBADD) $(LIBS)
|
|
+libkbuildsycoca_main.la: $(libkbuildsycoca_main_la_OBJECTS) $(libkbuildsycoca_main_la_DEPENDENCIES)
|
|
+ $(CXXLINK) -rpath $(libdir) $(libkbuildsycoca_main_la_LDFLAGS) $(libkbuildsycoca_main_la_OBJECTS) $(libkbuildsycoca_main_la_LIBADD) $(LIBS)
|
|
+libkded_main.la: $(libkded_main_la_OBJECTS) $(libkded_main_la_DEPENDENCIES)
|
|
+ $(CXXLINK) -rpath $(libdir) $(libkded_main_la_LDFLAGS) $(libkded_main_la_OBJECTS) $(libkded_main_la_LIBADD) $(LIBS)
|
|
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
|
|
install-binPROGRAMS: $(bin_PROGRAMS)
|
|
@$(NORMAL_INSTALL)
|
|
@@ -561,15 +590,18 @@
|
|
distclean-compile:
|
|
-rm -f *.tab.c
|
|
|
|
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kbuildimageiofactory.Plo@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kbuildprotocolinfofactory.Plo@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kbuildservicefactory.Plo@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kbuildservicegroupfactory.Plo@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kbuildservicetypefactory.Plo@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kbuildsycoca.Plo@am__quote@
|
|
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kbuildsycoca_main.Plo@am__quote@
|
|
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kbuildsycoca_main.Po@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kctimefactory.Plo@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kded.Plo@am__quote@
|
|
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kded_main.Plo@am__quote@
|
|
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kded_main.Po@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kdedmodule.Plo@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/khostname.Po@am__quote@
|
|
|
|
@@ -696,7 +728,7 @@
|
|
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
|
|
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
|
#>+ 4
|
|
-KDE_DIST=DESIGN kded.upd kded.h kdedmodule.desktop README.kded HOWTO kctimefactory.h
|
|
+KDE_DIST=README.kded DESIGN kdedmodule.desktop kded.h HOWTO kded.upd kctimefactory.h
|
|
|
|
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
|
|
|
|
@@ -821,9 +853,6 @@
|
|
uninstall-info-am uninstall-libLTLIBRARIES \
|
|
uninstall-servicetypeDATA uninstall-updateDATA
|
|
|
|
-
|
|
-dummy.cpp:
|
|
- echo > dummy.cpp
|
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
|
.NOEXPORT:
|
|
@@ -855,45 +884,45 @@
|
|
|
|
|
|
#>+ 11
|
|
-kbuildsycoca_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbuildsycoca.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kbuildimageiofactory.cpp $(srcdir)/kbuildprotocolinfofactory.cpp $(srcdir)/kctimefactory.cpp kbuildsycoca.moc
|
|
- @echo 'creating kbuildsycoca_la.all_cpp.cpp ...'; \
|
|
- rm -f kbuildsycoca_la.all_cpp.files kbuildsycoca_la.all_cpp.final; \
|
|
- echo "#define KDE_USE_FINAL 1" >> kbuildsycoca_la.all_cpp.final; \
|
|
+libkbuildsycoca_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbuildsycoca.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kbuildimageiofactory.cpp $(srcdir)/kbuildprotocolinfofactory.cpp $(srcdir)/kctimefactory.cpp kbuildsycoca.moc
|
|
+ @echo 'creating libkbuildsycoca_main_la.all_cpp.cpp ...'; \
|
|
+ rm -f libkbuildsycoca_main_la.all_cpp.files libkbuildsycoca_main_la.all_cpp.final; \
|
|
+ echo "#define KDE_USE_FINAL 1" >> libkbuildsycoca_main_la.all_cpp.final; \
|
|
for file in kbuildsycoca.cpp kbuildservicetypefactory.cpp kbuildservicefactory.cpp kbuildservicegroupfactory.cpp kbuildimageiofactory.cpp kbuildprotocolinfofactory.cpp kctimefactory.cpp ; do \
|
|
- echo "#include \"$$file\"" >> kbuildsycoca_la.all_cpp.files; \
|
|
- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kbuildsycoca_la.all_cpp.final; \
|
|
+ echo "#include \"$$file\"" >> libkbuildsycoca_main_la.all_cpp.files; \
|
|
+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkbuildsycoca_main_la.all_cpp.final; \
|
|
done; \
|
|
- cat kbuildsycoca_la.all_cpp.final kbuildsycoca_la.all_cpp.files > kbuildsycoca_la.all_cpp.cpp; \
|
|
- rm -f kbuildsycoca_la.all_cpp.final kbuildsycoca_la.all_cpp.files
|
|
+ cat libkbuildsycoca_main_la.all_cpp.final libkbuildsycoca_main_la.all_cpp.files > libkbuildsycoca_main_la.all_cpp.cpp; \
|
|
+ rm -f libkbuildsycoca_main_la.all_cpp.final libkbuildsycoca_main_la.all_cpp.files
|
|
|
|
#>+ 11
|
|
-kded_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kded.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kdedmodule.cpp kded.moc kdedmodule.moc
|
|
- @echo 'creating kded_la.all_cpp.cpp ...'; \
|
|
- rm -f kded_la.all_cpp.files kded_la.all_cpp.final; \
|
|
- echo "#define KDE_USE_FINAL 1" >> kded_la.all_cpp.final; \
|
|
+libkded_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kded.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kdedmodule.cpp kded.moc kdedmodule.moc
|
|
+ @echo 'creating libkded_main_la.all_cpp.cpp ...'; \
|
|
+ rm -f libkded_main_la.all_cpp.files libkded_main_la.all_cpp.final; \
|
|
+ echo "#define KDE_USE_FINAL 1" >> libkded_main_la.all_cpp.final; \
|
|
for file in kded.cpp kbuildservicetypefactory.cpp kbuildservicefactory.cpp kbuildservicegroupfactory.cpp kdedmodule.cpp ; do \
|
|
- echo "#include \"$$file\"" >> kded_la.all_cpp.files; \
|
|
- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kded_la.all_cpp.final; \
|
|
+ echo "#include \"$$file\"" >> libkded_main_la.all_cpp.files; \
|
|
+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkded_main_la.all_cpp.final; \
|
|
done; \
|
|
- cat kded_la.all_cpp.final kded_la.all_cpp.files > kded_la.all_cpp.cpp; \
|
|
- rm -f kded_la.all_cpp.final kded_la.all_cpp.files
|
|
+ cat libkded_main_la.all_cpp.final libkded_main_la.all_cpp.files > libkded_main_la.all_cpp.cpp; \
|
|
+ rm -f libkded_main_la.all_cpp.final libkded_main_la.all_cpp.files
|
|
|
|
#>+ 3
|
|
clean-final:
|
|
- -rm -f kbuildsycoca_la.all_cpp.cpp kded_la.all_cpp.cpp
|
|
+ -rm -f libkbuildsycoca_main_la.all_cpp.cpp libkded_main_la.all_cpp.cpp
|
|
|
|
#>+ 2
|
|
final:
|
|
- $(MAKE) kbuildsycoca_la_OBJECTS="$(kbuildsycoca_la_final_OBJECTS)" kded_la_OBJECTS="$(kded_la_final_OBJECTS)" all-am
|
|
+ $(MAKE) libkbuildsycoca_main_la_OBJECTS="$(libkbuildsycoca_main_la_final_OBJECTS)" libkded_main_la_OBJECTS="$(libkded_main_la_final_OBJECTS)" all-am
|
|
#>+ 2
|
|
final-install:
|
|
- $(MAKE) kbuildsycoca_la_OBJECTS="$(kbuildsycoca_la_final_OBJECTS)" kded_la_OBJECTS="$(kded_la_final_OBJECTS)" install-am
|
|
+ $(MAKE) libkbuildsycoca_main_la_OBJECTS="$(libkbuildsycoca_main_la_final_OBJECTS)" libkded_main_la_OBJECTS="$(libkded_main_la_final_OBJECTS)" install-am
|
|
#>+ 2
|
|
no-final:
|
|
- $(MAKE) kbuildsycoca_la_OBJECTS="$(kbuildsycoca_la_nofinal_OBJECTS)" kded_la_OBJECTS="$(kded_la_nofinal_OBJECTS)" all-am
|
|
+ $(MAKE) libkbuildsycoca_main_la_OBJECTS="$(libkbuildsycoca_main_la_nofinal_OBJECTS)" libkded_main_la_OBJECTS="$(libkded_main_la_nofinal_OBJECTS)" all-am
|
|
#>+ 2
|
|
no-final-install:
|
|
- $(MAKE) kbuildsycoca_la_OBJECTS="$(kbuildsycoca_la_nofinal_OBJECTS)" kded_la_OBJECTS="$(kded_la_nofinal_OBJECTS)" install-am
|
|
+ $(MAKE) libkbuildsycoca_main_la_OBJECTS="$(libkbuildsycoca_main_la_nofinal_OBJECTS)" libkded_main_la_OBJECTS="$(libkded_main_la_nofinal_OBJECTS)" install-am
|
|
#>+ 3
|
|
cvs-clean:
|
|
$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
|
|
@@ -904,8 +933,8 @@
|
|
|
|
#>+ 7
|
|
kbuildsycoca.lo: kbuildsycoca.moc
|
|
-kbuildsycoca.o: kbuildsycoca.moc
|
|
-kded.lo: kded.moc
|
|
-kdedmodule.lo: kdedmodule.moc
|
|
kded.o: kded.moc
|
|
+kded.lo: kded.moc
|
|
kdedmodule.o: kdedmodule.moc
|
|
+kbuildsycoca.o: kbuildsycoca.moc
|
|
+kdedmodule.lo: kdedmodule.moc
|