rev 3075 - trunk/packages/kdewebdev/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Thu Feb 2 16:24:03 UTC 2006
Author: chrsmrtn
Date: 2006-02-02 16:24:02 +0000 (Thu, 02 Feb 2006)
New Revision: 3075
Modified:
trunk/packages/kdewebdev/debian/patches/98_buildprep.diff
Log:
buildprep update.
Modified: trunk/packages/kdewebdev/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdewebdev/debian/patches/98_buildprep.diff 2006-02-02 16:23:25 UTC (rev 3074)
+++ trunk/packages/kdewebdev/debian/patches/98_buildprep.diff 2006-02-02 16:24:02 UTC (rev 3075)
@@ -11193,7 +11193,7 @@
+++ configure.in
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdewebdev, "3.5.0") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdewebdev, "3.5.1") dnl searches for some needed programs
+AM_MAINTAINER_MODE
+
@@ -11201,7 +11201,7 @@
dnl generate the config header
@@ -78,6 +80,8 @@
- AM_INIT_AUTOMAKE(kdewebdev, "3.5.0")
+ AM_INIT_AUTOMAKE(kdewebdev, "3.5.1")
KDE_ENABLE_HIDDEN_VISIBILITY
+AM_MAINTAINER_MODE
@@ -12207,7 +12207,19 @@
clean-noinstLTLIBRARIES:
--- klinkstatus/src/Makefile.in
+++ klinkstatus/src/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -66,9 +66,8 @@
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+ libklinkstatuspart_la_DEPENDENCIES = ui/settings/libsettings.la \
+- ui/libui.la engine/libengine.la utils/libutils.la \
+- parser/libparser.la $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1)
++ ui/libui.la engine/libengine.la parser/libparser.la \
++ utils/libutils.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ am_libklinkstatuspart_la_OBJECTS = klinkstatus_part.lo global.lo
+ #>- libklinkstatuspart_la_OBJECTS = $(am_libklinkstatuspart_la_OBJECTS)
+ #>+ 4
+@@ -260,6 +259,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12217,6 +12229,18 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
+@@ -453,8 +455,9 @@
+ #>- libklinkstatuspart_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)
+ #>+ 1
+ libklinkstatuspart_la_LDFLAGS = -module -no-undefined $(KDE_NO_UNDEFINED) $(KDE_PLUGIN) $(all_libraries)
+-libklinkstatuspart_la_LIBADD = ui/settings/libsettings.la ui/libui.la engine/libengine.la \
+- utils/libutils.la parser/libparser.la $(LIB_KPARTS) $(LIB_KFILE)
++libklinkstatuspart_la_LIBADD = ui/settings/libsettings.la \
++ ui/libui.la engine/libengine.la \
++ parser/libparser.la utils/libutils.la $(LIB_KPARTS) $(LIB_KFILE)
+
+
+ # this is where the desktop file will go
@@ -474,7 +477,7 @@
.SUFFIXES:
@@ -12433,6 +12457,19 @@
clean-noinstLTLIBRARIES:
--- kommander/editor/Makefile.in
+++ kommander/editor/Makefile.in
+@@ -107,10 +107,10 @@
+ @KDE_USE_FINAL_FALSE at kmdr_editor_OBJECTS = $(kmdr_editor_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE at kmdr_editor_OBJECTS = $(kmdr_editor_final_OBJECTS)
+ kmdr_editor_DEPENDENCIES = \
++ $(top_builddir)/kommander/factory/libkommanderfactory.la \
+ $(top_builddir)/kommander/widget/libkommanderwidget.la \
+ $(top_builddir)/kommander/widgets/libkommanderwidgets.la \
+- $(top_builddir)/kommander/plugin/libkommanderplugin.la \
+- $(top_builddir)/kommander/factory/libkommanderfactory.la
++ $(top_builddir)/kommander/plugin/libkommanderplugin.la
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
@@ -287,6 +287,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -12443,8 +12480,22 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -520,7 +523,7 @@
+@@ -462,9 +465,10 @@
+ kmdr_editor_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+ # the libraries to link against.
+-kmdr_editor_LDADD = $(top_builddir)/kommander/widget/libkommanderwidget.la \
+- $(top_builddir)/kommander/widgets/libkommanderwidgets.la $(top_builddir)/kommander/plugin/libkommanderplugin.la \
+- $(top_builddir)/kommander/factory/libkommanderfactory.la
++kmdr_editor_LDADD = $(top_builddir)/kommander/factory/libkommanderfactory.la \
++ $(top_builddir)/kommander/widget/libkommanderwidget.la \
++ $(top_builddir)/kommander/widgets/libkommanderwidgets.la \
++ $(top_builddir)/kommander/plugin/libkommanderplugin.la
+
+
+ # which sources should be compiled for kmdr_editor
+@@ -520,7 +524,7 @@
+
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -12452,7 +12503,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -558,9 +561,9 @@
+@@ -558,9 +562,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12464,7 +12515,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -990,18 +993,18 @@
+@@ -990,18 +994,18 @@
mocs: layout.moc
#>+ 3
@@ -12489,7 +12540,7 @@
#>+ 3
formfile.moc: $(srcdir)/formfile.h
-@@ -1032,18 +1035,18 @@
+@@ -1032,18 +1036,18 @@
mocs: workspace.moc
#>+ 3
@@ -12514,7 +12565,7 @@
#>+ 3
formsettingsimpl.moc: $(srcdir)/formsettingsimpl.h
-@@ -1053,18 +1056,18 @@
+@@ -1053,18 +1057,18 @@
mocs: formsettingsimpl.moc
#>+ 3
@@ -12539,7 +12590,7 @@
#>+ 3
newformimpl.moc: $(srcdir)/newformimpl.h
-@@ -1130,6 +1133,13 @@
+@@ -1130,6 +1134,13 @@
mocs: listvieweditorimpl.moc
#>+ 3
@@ -12553,7 +12604,7 @@
previewwidgetimpl.moc: $(srcdir)/previewwidgetimpl.h
$(MOC) $(srcdir)/previewwidgetimpl.h -o previewwidgetimpl.moc
-@@ -1137,11 +1147,11 @@
+@@ -1137,11 +1148,11 @@
mocs: previewwidgetimpl.moc
#>+ 3
@@ -12568,7 +12619,7 @@
#>+ 3
command.moc: $(srcdir)/command.h
-@@ -1158,13 +1168,6 @@
+@@ -1158,13 +1169,6 @@
mocs: assoctexteditorimpl.moc
#>+ 3
@@ -12582,7 +12633,7 @@
actioneditorimpl.moc: $(srcdir)/actioneditorimpl.h
$(MOC) $(srcdir)/actioneditorimpl.h -o actioneditorimpl.moc
-@@ -1172,18 +1175,18 @@
+@@ -1172,18 +1176,18 @@
mocs: actioneditorimpl.moc
#>+ 3
@@ -12607,7 +12658,7 @@
#>+ 3
choosewidgetimpl.moc: $(srcdir)/choosewidgetimpl.h
-@@ -1200,18 +1203,18 @@
+@@ -1200,18 +1204,18 @@
mocs: filechooser.moc
#>+ 3
@@ -12632,7 +12683,7 @@
#>+ 3
assistproc.moc: $(srcdir)/assistproc.h
-@@ -1221,18 +1224,18 @@
+@@ -1221,18 +1225,18 @@
mocs: assistproc.moc
#>+ 3
@@ -12657,7 +12708,7 @@
#>+ 3
iconvieweditorimpl.moc: $(srcdir)/iconvieweditorimpl.h
-@@ -1243,7 +1246,7 @@
+@@ -1243,7 +1247,7 @@
#>+ 3
clean-metasources:
@@ -12666,7 +12717,7 @@
#>+ 2
KDE_DIST=timestamp.cpp functions.ui multilineeditor.ui actioneditor.ui assoctexteditor.ui previewwidget.ui formsettings.ui wizardeditor.ui paletteeditoradvanced.ui preferences.ui choosewidget.ui kmdr-editor.desktop pixmapfunction.ui timestamp.h connectioneditor.ui createtemplate.ui Makefile.in tableeditor.ui iconvieweditor.ui paletteeditor.ui listvieweditor.ui listboxeditor.ui newform.ui functionsimpl.h Makefile.am listeditor.ui
-@@ -1314,7 +1317,7 @@
+@@ -1314,7 +1318,7 @@
#>+ 11
@@ -12675,7 +12726,7 @@
@echo 'creating kmdr_editor.all_cpp.cpp ...'; \
rm -f kmdr_editor.all_cpp.files kmdr_editor.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kmdr_editor.all_cpp.final; \
-@@ -1454,8 +1457,8 @@
+@@ -1454,8 +1458,8 @@
$(srcdir)/pixmapchooser.cpp: actioneditor.h assoctexteditor.h connectioneditor.h createtemplate.h formsettings.h iconvieweditor.h listboxeditor.h listeditor.h listvieweditor.h multilineeditor.h newform.h paletteeditor.h paletteeditoradvanced.h pixmapfunction.h preferences.h previewwidget.h tableeditor.h wizardeditor.h choosewidget.h functions.h
$(srcdir)/paletteeditorimpl.cpp: actioneditor.h assoctexteditor.h connectioneditor.h createtemplate.h formsettings.h iconvieweditor.h listboxeditor.h listeditor.h listvieweditor.h multilineeditor.h newform.h paletteeditor.h paletteeditoradvanced.h pixmapfunction.h preferences.h previewwidget.h tableeditor.h wizardeditor.h choosewidget.h functions.h
$(srcdir)/filechooser.cpp: actioneditor.h assoctexteditor.h connectioneditor.h createtemplate.h formsettings.h iconvieweditor.h listboxeditor.h listeditor.h listvieweditor.h multilineeditor.h newform.h paletteeditor.h paletteeditoradvanced.h pixmapfunction.h preferences.h previewwidget.h tableeditor.h wizardeditor.h choosewidget.h functions.h
@@ -12805,8 +12856,19 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -410,7 +413,7 @@
+@@ -394,7 +397,9 @@
+ AM_CPPFLAGS = -I$(top_srcdir)/kommander/widget -I$(top_srcdir)/kommander/plugin $(all_includes)
+ # the library search path.
+-libkommanderfactory_la_LDFLAGS = $(KDE_RPATH) $(all_libraries)
++#>- libkommanderfactory_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -no-undefined
++#>+ 1
++libkommanderfactory_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -no-undefined $(KDE_NO_UNDEFINED)
+ libkommanderfactory_la_LIBADD = $(top_builddir)/kommander/plugin/libkommanderplugin.la
+
+ # which sources should be compiled for factory
+@@ -410,7 +415,7 @@
+
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -12814,7 +12876,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -448,9 +451,9 @@
+@@ -448,9 +453,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12826,6 +12888,50 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
+@@ -461,7 +466,10 @@
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libkommanderfactory.la: $(libkommanderfactory_la_OBJECTS) $(libkommanderfactory_la_DEPENDENCIES)
++#>- libkommanderfactory.la: $(libkommanderfactory_la_OBJECTS) $(libkommanderfactory_la_DEPENDENCIES)
++#>+ 2
++ at KDE_USE_CLOSURE_TRUE@libkommanderfactory.la: libkommanderfactory.la.closure $(libkommanderfactory_la_OBJECTS) $(libkommanderfactory_la_DEPENDENCIES)
++ at KDE_USE_CLOSURE_FALSE@libkommanderfactory.la: $(libkommanderfactory_la_OBJECTS) $(libkommanderfactory_la_DEPENDENCIES)
+ $(CXXLINK) $(libkommanderfactory_la_LDFLAGS) $(libkommanderfactory_la_OBJECTS) $(libkommanderfactory_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -634,7 +642,7 @@
+ #>- clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+ #>- mostlyclean-am
+ #>+ 2
+-clean-am: clean-bcheck clean-final clean-generic clean-libtool clean-noinstLTLIBRARIES \
++clean-am: clean-closures clean-bcheck clean-final clean-generic clean-libtool clean-noinstLTLIBRARIES \
+ mostlyclean-am
+
+ distclean: distclean-am
+@@ -700,9 +708,22 @@
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
++#>+ 8
++libkommanderfactory.la.closure: $(libkommanderfactory_la_OBJECTS) $(libkommanderfactory_la_DEPENDENCIES)
++ @echo "int main() {return 0;}" > libkommanderfactory_la_closure.cpp
++ @$(LTCXXCOMPILE) -c libkommanderfactory_la_closure.cpp
++ $(CXXLINK) libkommanderfactory_la_closure.lo $(libkommanderfactory_la_LDFLAGS) $(libkommanderfactory_la_OBJECTS) $(libkommanderfactory_la_LIBADD) $(LIBS)
++ @rm -f libkommanderfactory_la_closure.* libkommanderfactory.la.closure
++ @echo "timestamp" > libkommanderfactory.la.closure
++
++
+ #>+ 2
+ KDE_DIST=kommanderversion.h Makefile.in Makefile.am
+
++#>+ 3
++clean-closures:
++ -rm -f libkommanderfactory.la.closure
++
+ #>+ 2
+ docs-am:
+
--- kommander/icons/Makefile.in
+++ kommander/icons/Makefile.in
@@ -177,6 +177,9 @@
@@ -12924,7 +13030,17 @@
mostlyclean-libtool:
--- kommander/plugin/Makefile.in
+++ kommander/plugin/Makefile.in
-@@ -219,6 +219,9 @@
+@@ -59,7 +59,8 @@
+ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+-libkommanderplugin_la_LIBADD =
++am__DEPENDENCIES_1 =
++libkommanderplugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ am_libkommanderplugin_la_OBJECTS = kommanderplugin.lo
+ #>- libkommanderplugin_la_OBJECTS = $(am_libkommanderplugin_la_OBJECTS)
+ #>+ 1
+@@ -219,6 +220,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12934,8 +13050,22 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -403,7 +406,7 @@
+@@ -391,7 +395,12 @@
+ INCLUDES = -I$(top_srcdir)/kommander/widget $(all_includes)
+ # the library search path.
+-libkommanderplugin_la_LDFLAGS = $(KDE_RPATH) $(all_libraries)
++#>- libkommanderplugin_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -no-undefined
++#>+ 1
++libkommanderplugin_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -no-undefined $(KDE_NO_UNDEFINED)
++
++# the libraries to link against.
++libkommanderplugin_la_LIBADD = $(LIB_QT)
+ libkommanderplugin_la_SOURCES = kommanderplugin.cpp
+ include_HEADERS = kommanderplugin.h
+
+@@ -403,7 +412,7 @@
+
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -12943,7 +13073,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -441,9 +444,9 @@
+@@ -441,9 +450,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12955,6 +13085,54 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -472,7 +481,10 @@
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libkommanderplugin.la: $(libkommanderplugin_la_OBJECTS) $(libkommanderplugin_la_DEPENDENCIES)
++#>- libkommanderplugin.la: $(libkommanderplugin_la_OBJECTS) $(libkommanderplugin_la_DEPENDENCIES)
++#>+ 2
++ at KDE_USE_CLOSURE_TRUE@libkommanderplugin.la: libkommanderplugin.la.closure $(libkommanderplugin_la_OBJECTS) $(libkommanderplugin_la_DEPENDENCIES)
++ at KDE_USE_CLOSURE_FALSE@libkommanderplugin.la: $(libkommanderplugin_la_OBJECTS) $(libkommanderplugin_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(libdir) $(libkommanderplugin_la_LDFLAGS) $(libkommanderplugin_la_OBJECTS) $(libkommanderplugin_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -644,7 +656,7 @@
+ #>- clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ #>- mostlyclean-am
+ #>+ 2
+-clean-am: clean-metasources clean-bcheck clean-generic clean-libLTLIBRARIES clean-libtool \
++clean-am: clean-metasources clean-closures clean-bcheck clean-generic clean-libLTLIBRARIES clean-libtool \
+ mostlyclean-am
+
+ distclean: distclean-am
+@@ -712,6 +724,15 @@
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
++#>+ 8
++libkommanderplugin.la.closure: $(libkommanderplugin_la_OBJECTS) $(libkommanderplugin_la_DEPENDENCIES)
++ @echo "int main() {return 0;}" > libkommanderplugin_la_closure.cpp
++ @$(LTCXXCOMPILE) -c libkommanderplugin_la_closure.cpp
++ $(CXXLINK) libkommanderplugin_la_closure.lo $(libkommanderplugin_la_LDFLAGS) $(libkommanderplugin_la_OBJECTS) $(libkommanderplugin_la_LIBADD) $(LIBS)
++ @rm -f libkommanderplugin_la_closure.* libkommanderplugin.la.closure
++ @echo "timestamp" > libkommanderplugin.la.closure
++
++
+ #>+ 3
+ kommanderplugin.moc: $(srcdir)/kommanderplugin.h
+ $(MOC) $(srcdir)/kommanderplugin.h -o kommanderplugin.moc
+@@ -726,6 +747,10 @@
+ #>+ 2
+ KDE_DIST=Makefile.in Makefile.am
+
++#>+ 3
++clean-closures:
++ -rm -f libkommanderplugin.la.closure
++
+ #>+ 2
+ docs-am:
+
--- kommander/pluginmanager/Makefile.in
+++ kommander/pluginmanager/Makefile.in
@@ -221,6 +221,9 @@
@@ -12990,7 +13168,18 @@
@$(NORMAL_INSTALL)
--- kommander/widget/Makefile.in
+++ kommander/widget/Makefile.in
-@@ -228,6 +228,9 @@
+@@ -59,7 +59,9 @@
+ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+-libkommanderwidget_la_LIBADD =
++am__DEPENDENCIES_1 =
++libkommanderwidget_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ am_libkommanderwidget_la_OBJECTS = kommanderwidget.lo myprocess.lo \
+ specialinformation.lo kommanderfunctions.lo specials.lo \
+ kommanderwindow.lo expression.lo parser.lo parsenode.lo \
+@@ -228,6 +230,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13000,8 +13189,22 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -416,7 +419,7 @@
+@@ -400,7 +405,12 @@
+ INCLUDES = $(all_includes)
+ # the library search path.
+-libkommanderwidget_la_LDFLAGS = $(KDE_RPATH) $(all_libraries)
++#>- libkommanderwidget_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -no-undefined
++#>+ 1
++libkommanderwidget_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -no-undefined $(KDE_NO_UNDEFINED)
++
++# the libraries to link against.
++libkommanderwidget_la_LIBADD = $(LIB_KIO) $(LIB_KDEUI) $(LIB_QT)
+ libkommanderwidget_la_SOURCES = kommanderwidget.cpp myprocess.cpp \
+ specialinformation.cpp kommanderfunctions.cpp specials.cpp \
+ kommanderwindow.cpp expression.cpp \
+@@ -416,7 +426,7 @@
+
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -13009,7 +13212,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -454,9 +457,9 @@
+@@ -454,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13021,9 +13224,69 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -485,7 +495,10 @@
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libkommanderwidget.la: $(libkommanderwidget_la_OBJECTS) $(libkommanderwidget_la_DEPENDENCIES)
++#>- libkommanderwidget.la: $(libkommanderwidget_la_OBJECTS) $(libkommanderwidget_la_DEPENDENCIES)
++#>+ 2
++ at KDE_USE_CLOSURE_TRUE@libkommanderwidget.la: libkommanderwidget.la.closure $(libkommanderwidget_la_OBJECTS) $(libkommanderwidget_la_DEPENDENCIES)
++ at KDE_USE_CLOSURE_FALSE@libkommanderwidget.la: $(libkommanderwidget_la_OBJECTS) $(libkommanderwidget_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(libdir) $(libkommanderwidget_la_LDFLAGS) $(libkommanderwidget_la_OBJECTS) $(libkommanderwidget_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -668,7 +681,7 @@
+ #>- clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ #>- mostlyclean-am
+ #>+ 2
+-clean-am: clean-metasources clean-bcheck clean-final clean-generic clean-libLTLIBRARIES clean-libtool \
++clean-am: clean-metasources clean-closures clean-bcheck clean-final clean-generic clean-libLTLIBRARIES clean-libtool \
+ mostlyclean-am
+
+ distclean: distclean-am
+@@ -736,6 +749,15 @@
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
++#>+ 8
++libkommanderwidget.la.closure: $(libkommanderwidget_la_OBJECTS) $(libkommanderwidget_la_DEPENDENCIES)
++ @echo "int main() {return 0;}" > libkommanderwidget_la_closure.cpp
++ @$(LTCXXCOMPILE) -c libkommanderwidget_la_closure.cpp
++ $(CXXLINK) libkommanderwidget_la_closure.lo $(libkommanderwidget_la_LDFLAGS) $(libkommanderwidget_la_OBJECTS) $(libkommanderwidget_la_LIBADD) $(LIBS)
++ @rm -f libkommanderwidget_la_closure.* libkommanderwidget.la.closure
++ @echo "timestamp" > libkommanderwidget.la.closure
++
++
+ #>+ 3
+ myprocess.moc: $(srcdir)/myprocess.h
+ $(MOC) $(srcdir)/myprocess.h -o myprocess.moc
+@@ -750,6 +772,10 @@
+ #>+ 2
+ KDE_DIST=myprocess.h parser.h parserdata.h expression.h kommanderwindow.h specialinformation.h specials.h parsenode.h Makefile.in function.h Makefile.am
+
++#>+ 3
++clean-closures:
++ -rm -f libkommanderwidget.la.closure
++
+ #>+ 2
+ docs-am:
+
--- kommander/widgets/Makefile.in
+++ kommander/widgets/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -61,8 +61,10 @@
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+ libkommanderwidgets_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
++ $(am__DEPENDENCIES_1) \
+ $(top_builddir)/kommander/widget/libkommanderwidget.la \
+- $(top_builddir)/kommander/plugin/libkommanderplugin.la
++ $(top_builddir)/kommander/plugin/libkommanderplugin.la \
++ $(top_builddir)/kommander/factory/libkommanderfactory.la
+ am_libkommanderwidgets_la_OBJECTS = buttongroup.lo subdialog.lo \
+ checkbox.lo closebutton.lo combobox.lo listbox.lo wizard.lo \
+ dialog.lo tabwidget.lo execbutton.lo fileselector.lo \
+@@ -236,6 +238,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13033,8 +13296,27 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -437,7 +440,7 @@
+@@ -409,12 +414,15 @@
+ # the library search path.
+ #widgets_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+-libkommanderwidgets_la_LDFLAGS = $(KDE_RPATH) $(all_libraries)
++#>- libkommanderwidgets_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -no-undefined
++#>+ 1
++libkommanderwidgets_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -no-undefined $(KDE_NO_UNDEFINED)
+
+ # the libraries to link against.
+-libkommanderwidgets_la_LIBADD = $(LIB_KIO) \
++libkommanderwidgets_la_LIBADD = $(LIB_KIO) $(LIB_QT) \
+ $(top_builddir)/kommander/widget/libkommanderwidget.la \
+- $(top_builddir)/kommander/plugin/libkommanderplugin.la
++ $(top_builddir)/kommander/plugin/libkommanderplugin.la \
++ $(top_builddir)/kommander/factory/libkommanderfactory.la
+
+
+ # which sources should be compiled for widgets
+@@ -437,7 +445,7 @@
+
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -13042,7 +13324,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -475,9 +478,9 @@
+@@ -475,9 +483,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13054,7 +13336,44 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -763,18 +766,18 @@
+@@ -506,7 +514,10 @@
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-libkommanderwidgets.la: $(libkommanderwidgets_la_OBJECTS) $(libkommanderwidgets_la_DEPENDENCIES)
++#>- libkommanderwidgets.la: $(libkommanderwidgets_la_OBJECTS) $(libkommanderwidgets_la_DEPENDENCIES)
++#>+ 2
++ at KDE_USE_CLOSURE_TRUE@libkommanderwidgets.la: libkommanderwidgets.la.closure $(libkommanderwidgets_la_OBJECTS) $(libkommanderwidgets_la_DEPENDENCIES)
++ at KDE_USE_CLOSURE_FALSE@libkommanderwidgets.la: $(libkommanderwidgets_la_OBJECTS) $(libkommanderwidgets_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(libdir) $(libkommanderwidgets_la_LDFLAGS) $(libkommanderwidgets_la_OBJECTS) $(libkommanderwidgets_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+@@ -689,7 +700,7 @@
+ #>- clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ #>- mostlyclean-am
+ #>+ 2
+-clean-am: clean-metasources clean-bcheck clean-final clean-generic clean-libLTLIBRARIES clean-libtool \
++clean-am: clean-metasources clean-closures clean-bcheck clean-final clean-generic clean-libLTLIBRARIES clean-libtool \
+ mostlyclean-am
+
+ distclean: distclean-am
+@@ -755,6 +766,15 @@
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
++#>+ 8
++libkommanderwidgets.la.closure: $(libkommanderwidgets_la_OBJECTS) $(libkommanderwidgets_la_DEPENDENCIES)
++ @echo "int main() {return 0;}" > libkommanderwidgets_la_closure.cpp
++ @$(LTCXXCOMPILE) -c libkommanderwidgets_la_closure.cpp
++ $(CXXLINK) libkommanderwidgets_la_closure.lo $(libkommanderwidgets_la_LDFLAGS) $(libkommanderwidgets_la_OBJECTS) $(libkommanderwidgets_la_LIBADD) $(LIBS)
++ @rm -f libkommanderwidgets_la_closure.* libkommanderwidgets.la.closure
++ @echo "timestamp" > libkommanderwidgets.la.closure
++
++
+ #>+ 3
+ listbox.moc: $(srcdir)/listbox.h
+ $(MOC) $(srcdir)/listbox.h -o listbox.moc
+@@ -763,18 +783,18 @@
mocs: listbox.moc
#>+ 3
@@ -13079,7 +13398,7 @@
#>+ 3
lineedit.moc: $(srcdir)/lineedit.h
-@@ -791,13 +794,6 @@
+@@ -791,13 +811,6 @@
mocs: table.moc
#>+ 3
@@ -13093,7 +13412,7 @@
subdialog.moc: $(srcdir)/subdialog.h
$(MOC) $(srcdir)/subdialog.h -o subdialog.moc
-@@ -812,6 +808,13 @@
+@@ -812,6 +825,13 @@
mocs: buttongroup.moc
#>+ 3
@@ -13107,7 +13426,7 @@
scriptobject.moc: $(srcdir)/scriptobject.h
$(MOC) $(srcdir)/scriptobject.h -o scriptobject.moc
-@@ -896,18 +899,18 @@
+@@ -896,18 +916,18 @@
mocs: tabwidget.moc
#>+ 3
@@ -13132,7 +13451,7 @@
#>+ 3
combobox.moc: $(srcdir)/combobox.h
-@@ -924,18 +927,18 @@
+@@ -924,18 +944,18 @@
mocs: progressbar.moc
#>+ 3
@@ -13157,7 +13476,7 @@
#>+ 3
richtexteditor.moc: $(srcdir)/richtexteditor.h
-@@ -953,7 +956,7 @@
+@@ -953,11 +973,15 @@
#>+ 3
clean-metasources:
@@ -13166,16 +13485,24 @@
#>+ 2
KDE_DIST=konsole.h table.h slider.h timer.h widgets.desktop progressbar.h Makefile.in Makefile.am
-@@ -1000,7 +1003,7 @@
++#>+ 3
++clean-closures:
++ -rm -f libkommanderwidgets.la.closure
++
+ #>+ 2
+ docs-am:
+@@ -1000,7 +1024,7 @@
+
+
#>+ 11
-libkommanderwidgets_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/buttongroup.cpp $(srcdir)/subdialog.cpp $(srcdir)/checkbox.cpp $(srcdir)/closebutton.cpp $(srcdir)/combobox.cpp $(srcdir)/listbox.cpp $(srcdir)/wizard.cpp $(srcdir)/dialog.cpp $(srcdir)/tabwidget.cpp $(srcdir)/execbutton.cpp $(srcdir)/fileselector.cpp $(srcdir)/groupbox.cpp $(srcdir)/lineedit.cpp $(srcdir)/radiobutton.cpp $(srcdir)/spinboxint.cpp $(srcdir)/textedit.cpp $(srcdir)/scriptobject.cpp $(srcdir)/richtexteditor.cpp $(srcdir)/treewidget.cpp $(srcdir)/plugin.cpp $(srcdir)/statusbar.cpp $(srcdir)/progressbar.cpp $(srcdir)/textbrowser.cpp $(srcdir)/slider.cpp $(srcdir)/label.cpp $(srcdir)/pixmaplabel.cpp $(srcdir)/konsole.cpp $(srcdir)/timer.cpp $(srcdir)/table.cpp listbox.moc closebutton.moc checkbox.moc lineedit.moc table.moc scriptobject.moc buttongroup.moc subdialog.moc timer.moc dialog.moc radiobutton.moc execbutton.moc textedit.moc slider.moc fileselector.moc wizard.moc textbrowser.moc pixmaplabel.moc konsole.moc groupbox.moc statusbar.moc tabwidget.moc combobox.moc progressbar.moc label.moc treewidget.moc richtexteditor.moc spinboxint.moc
+libkommanderwidgets_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/buttongroup.cpp $(srcdir)/subdialog.cpp $(srcdir)/checkbox.cpp $(srcdir)/closebutton.cpp $(srcdir)/combobox.cpp $(srcdir)/listbox.cpp $(srcdir)/wizard.cpp $(srcdir)/dialog.cpp $(srcdir)/tabwidget.cpp $(srcdir)/execbutton.cpp $(srcdir)/fileselector.cpp $(srcdir)/groupbox.cpp $(srcdir)/lineedit.cpp $(srcdir)/radiobutton.cpp $(srcdir)/spinboxint.cpp $(srcdir)/textedit.cpp $(srcdir)/scriptobject.cpp $(srcdir)/richtexteditor.cpp $(srcdir)/treewidget.cpp $(srcdir)/plugin.cpp $(srcdir)/statusbar.cpp $(srcdir)/progressbar.cpp $(srcdir)/textbrowser.cpp $(srcdir)/slider.cpp $(srcdir)/label.cpp $(srcdir)/pixmaplabel.cpp $(srcdir)/konsole.cpp $(srcdir)/timer.cpp $(srcdir)/table.cpp listbox.moc checkbox.moc closebutton.moc lineedit.moc table.moc scriptobject.moc timer.moc buttongroup.moc subdialog.moc dialog.moc radiobutton.moc execbutton.moc textedit.moc slider.moc fileselector.moc wizard.moc textbrowser.moc pixmaplabel.moc konsole.moc statusbar.moc groupbox.moc tabwidget.moc combobox.moc progressbar.moc treewidget.moc label.moc richtexteditor.moc spinboxint.moc
@echo 'creating libkommanderwidgets_la.all_cpp.cpp ...'; \
rm -f libkommanderwidgets_la.all_cpp.files libkommanderwidgets_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkommanderwidgets_la.all_cpp.final; \
-@@ -1044,8 +1047,8 @@
+@@ -1044,8 +1068,8 @@
groupbox.o: groupbox.moc
execbutton.lo: execbutton.moc
wizard.lo: wizard.moc
More information about the pkg-kde-commits
mailing list