rev 3068 - trunk/packages/kdenetwork/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Wed Feb 1 21:39:25 UTC 2006
Author: chrsmrtn
Date: 2006-02-01 21:39:23 +0000 (Wed, 01 Feb 2006)
New Revision: 3068
Modified:
trunk/packages/kdenetwork/debian/patches/98_buildprep.diff
Log:
Updated buildprep.
Modified: trunk/packages/kdenetwork/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdenetwork/debian/patches/98_buildprep.diff 2006-02-01 21:38:40 UTC (rev 3067)
+++ trunk/packages/kdenetwork/debian/patches/98_buildprep.diff 2006-02-01 21:39:23 UTC (rev 3068)
@@ -16504,77 +16504,7 @@
clean-noinstLTLIBRARIES:
--- kopete/plugins/smpppdcs/Makefile.in
+++ kopete/plugins/smpppdcs/Makefile.in
-@@ -57,19 +57,34 @@
- *) f=$$p;; \
- esac;
- am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-- "$(DESTDIR)$(servicedir)"
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kcmdir)" \
-+ "$(DESTDIR)$(kde_kcfgdir)" "$(DESTDIR)$(servicedir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES)
-+am__DEPENDENCIES_1 =
-+kcm_kopete_smpppdcs_la_DEPENDENCIES = \
-+ libsmpppdclient/libsmpppdclient.la \
-+ ../../libkopete/libkopete.la $(am__DEPENDENCIES_1)
-+am_kcm_kopete_smpppdcs_la_OBJECTS = smpppdcspreferences.lo \
-+ smpppdsearcher.lo smpppdcsprefsimpl.lo smpppdlocationwidget.lo
-+#>- kcm_kopete_smpppdcs_la_OBJECTS = $(am_kcm_kopete_smpppdcs_la_OBJECTS)
-+#>+ 5
-+kcm_kopete_smpppdcs_la_final_OBJECTS = kcm_kopete_smpppdcs_la.all_cpp.lo
-+kcm_kopete_smpppdcs_la_nofinal_OBJECTS = smpppdcspreferences.lo \
-+ smpppdsearcher.lo smpppdcsprefsimpl.lo smpppdlocationwidget.lo smpppdcsprefs.lo smpppdlocationui.lo smpppdcsconfig.lo
-+ at KDE_USE_FINAL_FALSE@kcm_kopete_smpppdcs_la_OBJECTS = $(kcm_kopete_smpppdcs_la_nofinal_OBJECTS)
-+ at KDE_USE_FINAL_TRUE@kcm_kopete_smpppdcs_la_OBJECTS = $(kcm_kopete_smpppdcs_la_final_OBJECTS)
- kopete_smpppdcs_la_DEPENDENCIES = libsmpppdclient/libsmpppdclient.la \
- ../../libkopete/libkopete.la
- am_kopete_smpppdcs_la_OBJECTS = smpppdcsplugin.lo onlineinquiry.lo \
-- detectordcop.lo detectorsmpppd.lo detectornetstat.lo
-+ detectordcop.lo detectorsmpppd.lo detectornetstat.lo \
-+ detectornetworkstatus.lo
- #>- kopete_smpppdcs_la_OBJECTS = $(am_kopete_smpppdcs_la_OBJECTS)
--#>+ 5
-+#>+ 6
- kopete_smpppdcs_la_final_OBJECTS = kopete_smpppdcs_la.all_cpp.lo
- kopete_smpppdcs_la_nofinal_OBJECTS = smpppdcsplugin.lo onlineinquiry.lo \
-- detectordcop.lo detectorsmpppd.lo detectornetstat.lo smpppdcsiface_skel.lo
-+ detectordcop.lo detectorsmpppd.lo detectornetstat.lo \
-+ detectornetworkstatus.lo kinternetiface_stub.lo smpppdcsiface_skel.lo smpppdcsconfig.lo
- @KDE_USE_FINAL_FALSE at kopete_smpppdcs_la_OBJECTS = $(kopete_smpppdcs_la_nofinal_OBJECTS)
- @KDE_USE_FINAL_TRUE at kopete_smpppdcs_la_OBJECTS = $(kopete_smpppdcs_la_final_OBJECTS)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-@@ -93,8 +108,10 @@
- #>+ 2
- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--SOURCES = $(kopete_smpppdcs_la_SOURCES)
--DIST_SOURCES = $(kopete_smpppdcs_la_SOURCES)
-+SOURCES = $(kcm_kopete_smpppdcs_la_SOURCES) \
-+ $(kopete_smpppdcs_la_SOURCES)
-+DIST_SOURCES = $(kcm_kopete_smpppdcs_la_SOURCES) \
-+ $(kopete_smpppdcs_la_SOURCES)
- #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- #>- html-recursive info-recursive install-data-recursive \
- #>- install-exec-recursive install-info-recursive \
-@@ -108,12 +125,14 @@
- install-recursive installcheck-recursive installdirs-recursive \
- pdf-recursive ps-recursive uninstall-info-recursive \
- uninstall-recursive nmcheck-recursive bcheck-recursive
-+kcmDATA_INSTALL = $(INSTALL_DATA)
-+kde_kcfgDATA_INSTALL = $(INSTALL_DATA)
- serviceDATA_INSTALL = $(INSTALL_DATA)
--DATA = $(service_DATA)
-+DATA = $(kcm_DATA) $(kde_kcfg_DATA) $(service_DATA)
- HEADERS = $(noinst_HEADERS)
- ETAGS = etags
- CTAGS = ctags
--DIST_SUBDIRS = icons libsmpppdclient config
-+DIST_SUBDIRS = $(SUBDIRS)
- #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- #>+ 1
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-@@ -261,6 +280,9 @@
+@@ -261,6 +261,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16584,63 +16514,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -452,26 +474,45 @@
- xdg_appsdir = @xdg_appsdir@
- xdg_directorydir = @xdg_directorydir@
- xdg_menudir = @xdg_menudir@
-- at include_smpppdcs_TRUE@SMPPPDCS_SUBDIR = config
- #>- METASOURCES = AUTO
--SUBDIRS = icons libsmpppdclient $(SMPPPDCS_SUBDIR)
-+SUBDIRS = icons libsmpppdclient unittest
- EXTRA_DIST = Changelog.smpppdcs
- AM_CPPFLAGS = $(KOPETE_INCLUDES) $(all_includes) -Ilibsmpppdclient
--kde_module_LTLIBRARIES = kopete_smpppdcs.la
--#>- kopete_smpppdcs_la_SOURCES = smpppdcsplugin.cpp onlineinquiry.cpp \
--#>- smpppdcsiface.skel detectordcop.cpp detectorsmpppd.cpp detectornetstat.cpp
--#>+ 2
--kopete_smpppdcs_la_SOURCES=smpppdcsplugin.cpp onlineinquiry.cpp \
-- detectordcop.cpp detectorsmpppd.cpp detectornetstat.cpp smpppdcsiface_skel.cpp
-+kde_module_LTLIBRARIES = kopete_smpppdcs.la kcm_kopete_smpppdcs.la
-+#>- kopete_smpppdcs_la_SOURCES = kinternetiface.stub smpppdcsplugin.cpp \
-+#>- onlineinquiry.cpp smpppdcsiface.skel detectordcop.cpp detectorsmpppd.cpp \
-+#>- detectornetstat.cpp detectornetworkstatus.cpp smpppdcsconfig.kcfgc
-+#>+ 3
-+kopete_smpppdcs_la_SOURCES= smpppdcsplugin.cpp \
-+ onlineinquiry.cpp detectordcop.cpp detectorsmpppd.cpp \
-+ detectornetstat.cpp detectornetworkstatus.cpp kinternetiface_stub.cpp smpppdcsiface_skel.cpp smpppdcsconfig.cpp
+@@ -479,7 +482,7 @@
- kopete_smpppdcs_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
- kopete_smpppdcs_la_LIBADD = \
- libsmpppdclient/libsmpppdclient.la ../../libkopete/libkopete.la
-
-+#>- kcm_kopete_smpppdcs_la_SOURCES = smpppdcsprefs.ui smpppdcspreferences.cpp \
-+#>- smpppdsearcher.cpp smpppdcsprefsimpl.cpp smpppdlocationui.ui smpppdlocationwidget.cpp \
-+#>- smpppdcsconfig.kcfgc
-+#>+ 3
-+kcm_kopete_smpppdcs_la_SOURCES= smpppdcspreferences.cpp \
-+ smpppdsearcher.cpp smpppdcsprefsimpl.cpp smpppdlocationwidget.cpp \
-+ smpppdcsprefs.cpp smpppdlocationui.cpp smpppdcsconfig.cpp
-+
-+#>- kcm_kopete_smpppdcs_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)
-+#>+ 1
-+kcm_kopete_smpppdcs_la_LDFLAGS = -module -no-undefined $(KDE_NO_UNDEFINED) $(KDE_PLUGIN) $(all_libraries)
-+kcm_kopete_smpppdcs_la_LIBADD = libsmpppdclient/libsmpppdclient.la \
-+ ../../libkopete/libkopete.la $(LIB_KUTILS)
-+
- service_DATA = kopete_smpppdcs.desktop
- servicedir = $(kde_servicesdir)
-+kcm_DATA = kopete_smpppdcs_config.desktop
-+kcmdir = $(kde_servicesdir)/kconfiguredialog
-+kde_kcfg_DATA = smpppdcs.kcfg
- noinst_HEADERS = smpppdcsiface.h detectordcop.h detectorsmpppd.h \
-- detectornetstat.h
-+ detectornetstat.h kinternetiface.h detectornetworkstatus.h \
-+ smpppdsearcher.h smpppdcsprefsimpl.h smpppdlocationwidget.h
-
- #>- all: all-recursive
- #>+ 1
-@@ -479,7 +520,7 @@
-
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -16648,7 +16523,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -517,9 +558,9 @@
+@@ -517,9 +520,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16660,391 +16535,6 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -548,6 +589,11 @@
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
-+#>- kcm_kopete_smpppdcs.la: $(kcm_kopete_smpppdcs_la_OBJECTS) $(kcm_kopete_smpppdcs_la_DEPENDENCIES)
-+#>+ 2
-+ at KDE_USE_CLOSURE_TRUE@kcm_kopete_smpppdcs.la: kcm_kopete_smpppdcs.la.closure $(kcm_kopete_smpppdcs_la_OBJECTS) $(kcm_kopete_smpppdcs_la_DEPENDENCIES)
-+ at KDE_USE_CLOSURE_FALSE@kcm_kopete_smpppdcs.la: $(kcm_kopete_smpppdcs_la_OBJECTS) $(kcm_kopete_smpppdcs_la_DEPENDENCIES)
-+ $(CXXLINK) -rpath $(kde_moduledir) $(kcm_kopete_smpppdcs_la_LDFLAGS) $(kcm_kopete_smpppdcs_la_OBJECTS) $(kcm_kopete_smpppdcs_la_LIBADD) $(LIBS)
- #>- kopete_smpppdcs.la: $(kopete_smpppdcs_la_OBJECTS) $(kopete_smpppdcs_la_DEPENDENCIES)
- #>+ 2
- @KDE_USE_CLOSURE_TRUE at kopete_smpppdcs.la: kopete_smpppdcs.la.closure $(kopete_smpppdcs_la_OBJECTS) $(kopete_smpppdcs_la_DEPENDENCIES)
-@@ -562,9 +608,14 @@
-
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/detectordcop.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/detectornetstat.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/detectornetworkstatus.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/detectorsmpppd.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/onlineinquiry.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/smpppdcsplugin.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/smpppdcspreferences.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/smpppdcsprefsimpl.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/smpppdlocationwidget.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/smpppdsearcher.Plo at am__quote@
-
- .cpp.o:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@@ -596,6 +647,40 @@
- distclean-libtool:
- -rm -f libtool
- uninstall-info-am:
-+install-kcmDATA: $(kcm_DATA)
-+ @$(NORMAL_INSTALL)
-+ test -z "$(kcmdir)" || $(mkdir_p) "$(DESTDIR)$(kcmdir)"
-+ @list='$(kcm_DATA)'; for p in $$list; do \
-+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+ f=$(am__strip_dir) \
-+ echo " $(kcmDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kcmdir)/$$f'"; \
-+ $(kcmDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kcmdir)/$$f"; \
-+ done
-+
-+uninstall-kcmDATA:
-+ @$(NORMAL_UNINSTALL)
-+ @list='$(kcm_DATA)'; for p in $$list; do \
-+ f=$(am__strip_dir) \
-+ echo " rm -f '$(DESTDIR)$(kcmdir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(kcmdir)/$$f"; \
-+ done
-+install-kde_kcfgDATA: $(kde_kcfg_DATA)
-+ @$(NORMAL_INSTALL)
-+ test -z "$(kde_kcfgdir)" || $(mkdir_p) "$(DESTDIR)$(kde_kcfgdir)"
-+ @list='$(kde_kcfg_DATA)'; for p in $$list; do \
-+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+ f=$(am__strip_dir) \
-+ echo " $(kde_kcfgDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_kcfgdir)/$$f'"; \
-+ $(kde_kcfgDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_kcfgdir)/$$f"; \
-+ done
-+
-+uninstall-kde_kcfgDATA:
-+ @$(NORMAL_UNINSTALL)
-+ @list='$(kde_kcfg_DATA)'; for p in $$list; do \
-+ f=$(am__strip_dir) \
-+ echo " rm -f '$(DESTDIR)$(kde_kcfgdir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(kde_kcfgdir)/$$f"; \
-+ done
- install-serviceDATA: $(service_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
-@@ -793,7 +878,7 @@
- all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
- installdirs: installdirs-recursive
- installdirs-am:
-- for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(servicedir)"; do \
-+ for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kcmdir)" "$(DESTDIR)$(kde_kcfgdir)" "$(DESTDIR)$(servicedir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
- done
- install: install-recursive
-@@ -827,7 +912,7 @@
- #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
- #>- mostlyclean-am
- #>+ 2
--clean-am: clean-metasources clean-idl clean-closures clean-bcheck clean-final clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
-+clean-am: clean-metasources clean-idl clean-ui clean-kcfg clean-closures clean-bcheck clean-final clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
- mostlyclean-am
-
- distclean: distclean-recursive
-@@ -846,9 +931,11 @@
-
- info-am:
-
--#>- install-data-am: install-kde_moduleLTLIBRARIES install-serviceDATA
--#>+ 1
--install-data-am: install-serviceDATA
-+#>- install-data-am: install-kcmDATA install-kde_kcfgDATA \
-+#>- install-kde_moduleLTLIBRARIES install-serviceDATA
-+#>+ 2
-+install-data-am: install-kcmDATA install-kde_kcfgDATA \
-+ install-serviceDATA
-
- #>- install-exec-am:
- #>+ 1
-@@ -878,7 +965,8 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-+uninstall-am: uninstall-info-am uninstall-kcmDATA \
-+ uninstall-kde_kcfgDATA uninstall-kde_moduleLTLIBRARIES \
- uninstall-serviceDATA
-
- uninstall-info: uninstall-info-recursive
-@@ -890,35 +978,44 @@
- distclean-recursive distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-exec install-exec-am install-info \
-- install-info-am install-kde_moduleLTLIBRARIES install-man \
-- install-serviceDATA install-strip installcheck installcheck-am \
-- installdirs installdirs-am maintainer-clean \
-- maintainer-clean-generic maintainer-clean-recursive \
-- mostlyclean mostlyclean-compile mostlyclean-generic \
-- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-- tags tags-recursive uninstall uninstall-am uninstall-info-am \
-+ install-info-am install-kcmDATA install-kde_kcfgDATA \
-+ install-kde_moduleLTLIBRARIES install-man install-serviceDATA \
-+ install-strip installcheck installcheck-am installdirs \
-+ installdirs-am maintainer-clean maintainer-clean-generic \
-+ maintainer-clean-recursive mostlyclean mostlyclean-compile \
-+ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-+ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-+ uninstall-info-am uninstall-kcmDATA uninstall-kde_kcfgDATA \
- uninstall-kde_moduleLTLIBRARIES uninstall-serviceDATA
-
- # 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:
-
--#>+ 5
--smpppdcsiface.kidl: $(srcdir)/smpppdcsiface.h $(DCOP_DEPENDENCIES)
-- $(DCOPIDL) $(srcdir)/smpppdcsiface.h > smpppdcsiface.kidl || ( rm -f smpppdcsiface.kidl ; false )
--smpppdcsiface_skel.cpp: smpppdcsiface.kidl
-- $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub smpppdcsiface.kidl
--
- #>+ 8
--kopete_smpppdcs.la.closure: $(kopete_smpppdcs_la_OBJECTS) $(kopete_smpppdcs_la_DEPENDENCIES)
-- @echo "int main() {return 0;}" > kopete_smpppdcs_la_closure.cpp
-- @$(LTCXXCOMPILE) -c kopete_smpppdcs_la_closure.cpp
-- $(CXXLINK) kopete_smpppdcs_la_closure.lo $(kopete_smpppdcs_la_LDFLAGS) $(kopete_smpppdcs_la_OBJECTS) $(kopete_smpppdcs_la_LIBADD) $(LIBS)
-- @rm -f kopete_smpppdcs_la_closure.* kopete_smpppdcs.la.closure
-- @echo "timestamp" > kopete_smpppdcs.la.closure
-+kcm_kopete_smpppdcs.la.closure: $(kcm_kopete_smpppdcs_la_OBJECTS) $(kcm_kopete_smpppdcs_la_DEPENDENCIES)
-+ @echo "int main() {return 0;}" > kcm_kopete_smpppdcs_la_closure.cpp
-+ @$(LTCXXCOMPILE) -c kcm_kopete_smpppdcs_la_closure.cpp
-+ $(CXXLINK) kcm_kopete_smpppdcs_la_closure.lo $(kcm_kopete_smpppdcs_la_LDFLAGS) $(kcm_kopete_smpppdcs_la_OBJECTS) $(kcm_kopete_smpppdcs_la_LIBADD) $(LIBS)
-+ @rm -f kcm_kopete_smpppdcs_la_closure.* kcm_kopete_smpppdcs.la.closure
-+ @echo "timestamp" > kcm_kopete_smpppdcs.la.closure
-
-
- #>+ 3
-+smpppdcsprefsimpl.moc: $(srcdir)/smpppdcsprefsimpl.h
-+ $(MOC) $(srcdir)/smpppdcsprefsimpl.h -o smpppdcsprefsimpl.moc
-+
-+#>+ 2
-+mocs: smpppdcsprefsimpl.moc
-+
-+#>+ 3
-+smpppdcspreferences.moc: $(srcdir)/smpppdcspreferences.h
-+ $(MOC) $(srcdir)/smpppdcspreferences.h -o smpppdcspreferences.moc
-+
-+#>+ 2
-+mocs: smpppdcspreferences.moc
-+
-+#>+ 3
- detectornetstat.moc: $(srcdir)/detectornetstat.h
- $(MOC) $(srcdir)/detectornetstat.h -o detectornetstat.moc
-
-@@ -926,6 +1023,13 @@
- mocs: detectornetstat.moc
-
- #>+ 3
-+smpppdlocationwidget.moc: $(srcdir)/smpppdlocationwidget.h
-+ $(MOC) $(srcdir)/smpppdlocationwidget.h -o smpppdlocationwidget.moc
-+
-+#>+ 2
-+mocs: smpppdlocationwidget.moc
-+
-+#>+ 3
- smpppdcsplugin.moc: $(srcdir)/smpppdcsplugin.h
- $(MOC) $(srcdir)/smpppdcsplugin.h -o smpppdcsplugin.moc
-
-@@ -933,20 +1037,66 @@
- mocs: smpppdcsplugin.moc
-
- #>+ 3
-+detectornetworkstatus.moc: $(srcdir)/detectornetworkstatus.h
-+ $(MOC) $(srcdir)/detectornetworkstatus.h -o detectornetworkstatus.moc
-+
-+#>+ 2
-+mocs: detectornetworkstatus.moc
-+
-+#>+ 3
-+smpppdsearcher.moc: $(srcdir)/smpppdsearcher.h
-+ $(MOC) $(srcdir)/smpppdsearcher.h -o smpppdsearcher.moc
-+
-+#>+ 2
-+mocs: smpppdsearcher.moc
-+
-+#>+ 9
-+kinternetiface.kidl: $(srcdir)/kinternetiface.h $(DCOP_DEPENDENCIES)
-+ $(DCOPIDL) $(srcdir)/kinternetiface.h > kinternetiface.kidl || ( rm -f kinternetiface.kidl ; false )
-+kinternetiface_stub.h: kinternetiface.kidl
-+ $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-skel kinternetiface.kidl
-+smpppdcsiface.kidl: $(srcdir)/smpppdcsiface.h $(DCOP_DEPENDENCIES)
-+ $(DCOPIDL) $(srcdir)/smpppdcsiface.h > smpppdcsiface.kidl || ( rm -f smpppdcsiface.kidl ; false )
-+smpppdcsiface_skel.cpp: smpppdcsiface.kidl
-+ $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub smpppdcsiface.kidl
-+
-+#>+ 8
-+kopete_smpppdcs.la.closure: $(kopete_smpppdcs_la_OBJECTS) $(kopete_smpppdcs_la_DEPENDENCIES)
-+ @echo "int main() {return 0;}" > kopete_smpppdcs_la_closure.cpp
-+ @$(LTCXXCOMPILE) -c kopete_smpppdcs_la_closure.cpp
-+ $(CXXLINK) kopete_smpppdcs_la_closure.lo $(kopete_smpppdcs_la_LDFLAGS) $(kopete_smpppdcs_la_OBJECTS) $(kopete_smpppdcs_la_LIBADD) $(LIBS)
-+ @rm -f kopete_smpppdcs_la_closure.* kopete_smpppdcs.la.closure
-+ @echo "timestamp" > kopete_smpppdcs.la.closure
-+
-+
-+#>+ 3
- clean-metasources:
-- -rm -f detectornetstat.moc smpppdcsplugin.moc
-+ -rm -f smpppdcsprefsimpl.moc smpppdcspreferences.moc detectornetstat.moc smpppdlocationwidget.moc smpppdcsplugin.moc detectornetworkstatus.moc smpppdsearcher.moc
-
- #>+ 2
--KDE_DIST=onlineinquiry.h kopete_smpppdcs.desktop iconnector.h Makefile.in detector.h smpppdcsplugin.h Makefile.am
-+KDE_DIST=kopete_smpppdcs_config.desktop smpppdcsconfig.kcfgc smpppdlocationui.ui onlineinquiry.h smpppdcspreferences.h smpppdcsprefs.ui kopete_smpppdcs.desktop iconnector.h smpppdcs.kcfg Makefile.in detector.h smpppdcsplugin.h Makefile.am
-
--#>+ 4
-+#>+ 5
- clean-idl:
- -rm -f \
-+ kinternetiface_stub.cpp kinternetiface_stub.h kinternetiface.kidl \
- smpppdcsiface_skel.cpp smpppdcsiface_skel.h smpppdcsiface.kidl
-
-+#>+ 5
-+clean-ui:
-+ -rm -f \
-+ smpppdcsprefs.cpp smpppdcsprefs.h smpppdcsprefs.moc \
-+ smpppdlocationui.cpp smpppdlocationui.h smpppdlocationui.moc
-+
-+#>+ 5
-+clean-kcfg:
-+ -rm -f \
-+ smpppdcsconfig.cpp smpppdcsconfig.h \
-+ smpppdcsconfig.cpp smpppdcsconfig.h
-+
- #>+ 3
- clean-closures:
-- -rm -f kopete_smpppdcs.la.closure
-+ -rm -f kcm_kopete_smpppdcs.la.closure kopete_smpppdcs.la.closure
-
- #>+ 2
- docs-am:
-@@ -990,11 +1140,23 @@
-
-
- #>+ 11
--kopete_smpppdcs_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/smpppdcsplugin.cpp $(srcdir)/onlineinquiry.cpp $(srcdir)/detectordcop.cpp $(srcdir)/detectorsmpppd.cpp $(srcdir)/detectornetstat.cpp smpppdcsiface_skel.cpp detectornetstat.moc smpppdcsplugin.moc
-+kcm_kopete_smpppdcs_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/smpppdcspreferences.cpp $(srcdir)/smpppdsearcher.cpp $(srcdir)/smpppdcsprefsimpl.cpp $(srcdir)/smpppdlocationwidget.cpp smpppdcsprefs.cpp smpppdlocationui.cpp smpppdcsconfig.cpp smpppdsearcher.moc smpppdcsprefsimpl.moc smpppdcspreferences.moc smpppdlocationui.moc smpppdlocationwidget.moc smpppdcsprefs.moc
-+ @echo 'creating kcm_kopete_smpppdcs_la.all_cpp.cpp ...'; \
-+ rm -f kcm_kopete_smpppdcs_la.all_cpp.files kcm_kopete_smpppdcs_la.all_cpp.final; \
-+ echo "#define KDE_USE_FINAL 1" >> kcm_kopete_smpppdcs_la.all_cpp.final; \
-+ for file in smpppdcspreferences.cpp smpppdsearcher.cpp smpppdcsprefsimpl.cpp smpppdlocationwidget.cpp smpppdcsprefs.cpp smpppdlocationui.cpp smpppdcsconfig.cpp ; do \
-+ echo "#include \"$$file\"" >> kcm_kopete_smpppdcs_la.all_cpp.files; \
-+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcm_kopete_smpppdcs_la.all_cpp.final; \
-+ done; \
-+ cat kcm_kopete_smpppdcs_la.all_cpp.final kcm_kopete_smpppdcs_la.all_cpp.files > kcm_kopete_smpppdcs_la.all_cpp.cpp; \
-+ rm -f kcm_kopete_smpppdcs_la.all_cpp.final kcm_kopete_smpppdcs_la.all_cpp.files
-+
-+#>+ 11
-+kopete_smpppdcs_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/smpppdcsplugin.cpp $(srcdir)/onlineinquiry.cpp $(srcdir)/detectordcop.cpp $(srcdir)/detectorsmpppd.cpp $(srcdir)/detectornetstat.cpp $(srcdir)/detectornetworkstatus.cpp kinternetiface_stub.cpp smpppdcsiface_skel.cpp smpppdcsconfig.cpp detectornetstat.moc smpppdcsplugin.moc detectornetworkstatus.moc
- @echo 'creating kopete_smpppdcs_la.all_cpp.cpp ...'; \
- rm -f kopete_smpppdcs_la.all_cpp.files kopete_smpppdcs_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> kopete_smpppdcs_la.all_cpp.final; \
-- for file in smpppdcsplugin.cpp onlineinquiry.cpp detectordcop.cpp detectorsmpppd.cpp detectornetstat.cpp smpppdcsiface_skel.cpp ; do \
-+ for file in smpppdcsplugin.cpp onlineinquiry.cpp detectordcop.cpp detectorsmpppd.cpp detectornetstat.cpp detectornetworkstatus.cpp kinternetiface_stub.cpp smpppdcsiface_skel.cpp smpppdcsconfig.cpp ; do \
- echo "#include \"$$file\"" >> kopete_smpppdcs_la.all_cpp.files; \
- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kopete_smpppdcs_la.all_cpp.final; \
- done; \
-@@ -1003,32 +1165,90 @@
-
- #>+ 3
- clean-final:
-- -rm -f kopete_smpppdcs_la.all_cpp.cpp
-+ -rm -f kcm_kopete_smpppdcs_la.all_cpp.cpp kopete_smpppdcs_la.all_cpp.cpp
-
- #>+ 3
- final:
-- $(MAKE) kopete_smpppdcs_la_OBJECTS="$(kopete_smpppdcs_la_final_OBJECTS)" all-am
-+ $(MAKE) kcm_kopete_smpppdcs_la_OBJECTS="$(kcm_kopete_smpppdcs_la_final_OBJECTS)" kopete_smpppdcs_la_OBJECTS="$(kopete_smpppdcs_la_final_OBJECTS)" all-am
-
- #>+ 3
- final-install:
-- $(MAKE) kopete_smpppdcs_la_OBJECTS="$(kopete_smpppdcs_la_final_OBJECTS)" install-am
-+ $(MAKE) kcm_kopete_smpppdcs_la_OBJECTS="$(kcm_kopete_smpppdcs_la_final_OBJECTS)" kopete_smpppdcs_la_OBJECTS="$(kopete_smpppdcs_la_final_OBJECTS)" install-am
-
- #>+ 3
- no-final:
-- $(MAKE) kopete_smpppdcs_la_OBJECTS="$(kopete_smpppdcs_la_nofinal_OBJECTS)" all-am
-+ $(MAKE) kcm_kopete_smpppdcs_la_OBJECTS="$(kcm_kopete_smpppdcs_la_nofinal_OBJECTS)" kopete_smpppdcs_la_OBJECTS="$(kopete_smpppdcs_la_nofinal_OBJECTS)" all-am
-
- #>+ 3
- no-final-install:
-- $(MAKE) kopete_smpppdcs_la_OBJECTS="$(kopete_smpppdcs_la_nofinal_OBJECTS)" install-am
-+ $(MAKE) kcm_kopete_smpppdcs_la_OBJECTS="$(kcm_kopete_smpppdcs_la_nofinal_OBJECTS)" kopete_smpppdcs_la_OBJECTS="$(kopete_smpppdcs_la_nofinal_OBJECTS)" install-am
-
- #>+ 3
- kde-rpo-clean:
- -rm -f *.rpo
-
--#>+ 7
--nmcheck:
-+#>+ 28
-+$(srcdir)/detectorsmpppd.cpp: kinternetiface_stub.h smpppdcsconfig.h
- smpppdcsplugin.o: smpppdcsplugin.moc
-+$(srcdir)/smpppdcsprefsimpl.cpp: smpppdcsprefs.h smpppdlocationui.h smpppdcsconfig.h
- smpppdcsplugin.lo: smpppdcsplugin.moc
-+smpppdlocationwidget.lo: smpppdlocationwidget.moc
-+smpppdcsprefsimpl.lo: smpppdcsprefsimpl.moc
-+$(srcdir)/detectornetstat.cpp: kinternetiface_stub.h smpppdcsconfig.h
-+smpppdlocationwidget.o: smpppdlocationwidget.moc
-+detectornetstat.lo: detectornetstat.moc
-+$(srcdir)/detectornetworkstatus.cpp: kinternetiface_stub.h smpppdcsconfig.h
-+$(srcdir)/smpppdcspreferences.cpp: smpppdcsprefs.h smpppdlocationui.h smpppdcsconfig.h
-+$(srcdir)/onlineinquiry.cpp: kinternetiface_stub.h smpppdcsconfig.h
-+kinternetiface_stub.cpp: kinternetiface_stub.h
-+smpppdcspreferences.lo: smpppdcspreferences.moc
-+$(srcdir)/smpppdcsplugin.cpp: kinternetiface_stub.h smpppdcsconfig.h
-+nmcheck:
-+smpppdsearcher.lo: smpppdsearcher.moc
-+detectornetworkstatus.lo: detectornetworkstatus.moc
-+smpppdsearcher.o: smpppdsearcher.moc
-+$(srcdir)/smpppdsearcher.cpp: smpppdcsprefs.h smpppdlocationui.h smpppdcsconfig.h
-+smpppdcsprefsimpl.o: smpppdcsprefsimpl.moc
- detectornetstat.o: detectornetstat.moc
- nmcheck-am: nmcheck
--detectornetstat.lo: detectornetstat.moc
-+$(srcdir)/detectordcop.cpp: kinternetiface_stub.h smpppdcsconfig.h
-+$(srcdir)/smpppdlocationwidget.cpp: smpppdcsprefs.h smpppdlocationui.h smpppdcsconfig.h
-+detectornetworkstatus.o: detectornetworkstatus.moc
-+smpppdcspreferences.o: smpppdcspreferences.moc
-+
-+#>+ 36
-+smpppdlocationui.cpp: $(srcdir)/smpppdlocationui.ui smpppdlocationui.h smpppdlocationui.moc
-+ rm -f smpppdlocationui.cpp
-+ echo '#include <kdialog.h>' > smpppdlocationui.cpp
-+ echo '#include <klocale.h>' >> smpppdlocationui.cpp
-+ $(UIC) -tr ${UIC_TR} -i smpppdlocationui.h $(srcdir)/smpppdlocationui.ui > smpppdlocationui.cpp.temp ; ret=$$?; \
-+ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" smpppdlocationui.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_smpppdlocationui,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> smpppdlocationui.cpp ;\
-+ rm -f smpppdlocationui.cpp.temp ;\
-+ if test "$$ret" = 0; then echo '#include "smpppdlocationui.moc"' >> smpppdlocationui.cpp; else rm -f smpppdlocationui.cpp ; exit $$ret ; fi
-+
-+smpppdlocationui.h: $(srcdir)/smpppdlocationui.ui
-+ rm -rf smpppdlocationui.h;
-+ $(UIC) $(srcdir)/smpppdlocationui.ui | $(PERL) -pi -e "s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g" >> smpppdlocationui.h ;
-+smpppdlocationui.moc: smpppdlocationui.h
-+ $(MOC) smpppdlocationui.h -o smpppdlocationui.moc
-+
-+smpppdcsprefs.cpp: $(srcdir)/smpppdcsprefs.ui smpppdcsprefs.h smpppdcsprefs.moc
-+ rm -f smpppdcsprefs.cpp
-+ echo '#include <kdialog.h>' > smpppdcsprefs.cpp
-+ echo '#include <klocale.h>' >> smpppdcsprefs.cpp
-+ $(UIC) -tr ${UIC_TR} -i smpppdcsprefs.h $(srcdir)/smpppdcsprefs.ui > smpppdcsprefs.cpp.temp ; ret=$$?; \
-+ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" smpppdcsprefs.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_smpppdcsprefs,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> smpppdcsprefs.cpp ;\
-+ rm -f smpppdcsprefs.cpp.temp ;\
-+ if test "$$ret" = 0; then echo '#include "smpppdcsprefs.moc"' >> smpppdcsprefs.cpp; else rm -f smpppdcsprefs.cpp ; exit $$ret ; fi
-+
-+smpppdcsprefs.h: $(srcdir)/smpppdcsprefs.ui
-+ rm -rf smpppdcsprefs.h;
-+ $(UIC) $(srcdir)/smpppdcsprefs.ui | $(PERL) -pi -e "s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g" >> smpppdcsprefs.h ;
-+smpppdcsprefs.moc: smpppdcsprefs.h
-+ $(MOC) smpppdcsprefs.h -o smpppdcsprefs.moc
-+
-+smpppdcsconfig.cpp: smpppdcsconfig.h
-+smpppdcsconfig.h: $(srcdir)/smpppdcs.kcfg $(srcdir)/smpppdcsconfig.kcfgc $(KCFG_DEPENDENCIES)
-+ $(KCONFIG_COMPILER) $(srcdir)/smpppdcs.kcfg $(srcdir)/smpppdcsconfig.kcfgc; ret=$$?; \
-+ if test "$$ret" != 0; then rm -f smpppdcsconfig.h ; exit $$ret ; fi
-+
--- kopete/plugins/smpppdcs/unittest/Makefile.in
+++ kopete/plugins/smpppdcs/unittest/Makefile.in
@@ -0,0 +1,807 @@
More information about the pkg-kde-commits
mailing list