[prev in list] [next in list] [prev in thread] [next in thread] 

List:       koffice-devel
Subject:    Makefile.am patches for karbon / kivio
From:       Ben Burton <benb () acm ! org>
Date:       2002-07-06 5:34:30
[Download RAW message or body]


Hi.  Could the following patches please be applied to Makefile.ams in karbon 
and kivio?

The karbon patch is just to make libkarbonpart.so a kde_module instead of an 
ordinary lib, in line with other koffice apps.

The kivio patches make the libkivio*tool modules actual kde_modules instead 
of ordinary libs, but I'm less happy with that since some of the changes are 
within the "KDEStudio will overwrite your changes" sections.

Ben.


--- karbon/Makefile.am	2002/06/18 07:37:48	1.41
+++ karbon/Makefile.am	2002/07/05 11:01:39
@@ -13,9 +13,8 @@ SUBDIRS = core shapes widgets dialogs co
 
 bin_PROGRAMS = karbon
 
-lib_LTLIBRARIES = \
-	karbon.la \
-	libkarbonpart.la
+lib_LTLIBRARIES = karbon.la
+kde_module_LTLIBRARIES = libkarbonpart.la
 
 libkarbonpart_la_SOURCES = \
 	karbon_factory.cc \
--- kivio/plugins/kivioconnectortool/Makefile.am	2001/10/05 01:43:16	1.9
+++ kivio/plugins/kivioconnectortool/Makefile.am	2002/07/05 11:01:40
@@ -3,7 +3,7 @@
 #### WARNING! All changes made in this part will be lost! ####
 ##############################################################
 SUBDIRS = straight_connector 
-lib_LTLIBRARIES =libkivioconnectortool.la
+kde_module_LTLIBRARIES =libkivioconnectortool.la
 
 
 INCLUDES = -I$(top_srcdir)/kivio/kiviopart\
@@ -29,7 +29,7 @@ EXTRA_DIST = \
 ##############################################################
 ####                  END KDEStudio part                  ####
 #2########################################################!@#$
-libkivioconnectortool_la_LDFLAGS = -avoid-version -module -no-undefined
+libkivioconnectortool_la_LDFLAGS = -module $(KDE_PLUGIN)
 libkivioconnectortool_la_LIBADD = $(all_libraries) 
$(top_builddir)/kivio/kiviopart/libkiviopart.la
 
 rc_DATA = kivioconnectortool.rc
--- kivio/plugins/kivioselecttool/Makefile.am	2001/10/05 01:43:16	1.7
+++ kivio/plugins/kivioselecttool/Makefile.am	2002/07/05 11:01:40
@@ -3,7 +3,7 @@
 #### WARNING! All changes made in this part will be lost! ####
 ##############################################################
 SUBDIRS = select_pics 
-lib_LTLIBRARIES =libkivioselecttool.la
+kde_module_LTLIBRARIES =libkivioselecttool.la
 
 
 INCLUDES = -I$(top_srcdir)/kivio/kiviopart\
@@ -25,7 +25,7 @@ EXTRA_DIST = \
 ##############################################################
 ####                  END KDEStudio part                  ####
 #2########################################################!@#$
-libkivioselecttool_la_LDFLAGS = -avoid-version -module -no-undefined
+libkivioselecttool_la_LDFLAGS = -module $(KDE_PLUGIN)
 libkivioselecttool_la_LIBADD = $(all_libraries) 
$(top_builddir)/kivio/kiviopart/libkiviopart.la
 
 rc_DATA = kivioselecttool.rc
--- kivio/plugins/kiviotexttool/Makefile.am	2001/10/05 01:43:16	1.7
+++ kivio/plugins/kiviotexttool/Makefile.am	2002/07/05 11:01:40
@@ -3,7 +3,7 @@
 #### WARNING! All changes made in this part will be lost! ####
 ##############################################################
 
-lib_LTLIBRARIES =libkiviotexttool.la
+kde_module_LTLIBRARIES =libkiviotexttool.la
 
 
 INCLUDES = -I$(top_srcdir)/kivio/kiviopart\
@@ -29,7 +29,7 @@ EXTRA_DIST = \
 ##############################################################
 ####                  END KDEStudio part                  ####
 #2########################################################!@#$
-libkiviotexttool_la_LDFLAGS = -avoid-version -module -no-undefined
+libkiviotexttool_la_LDFLAGS = -module $(KDE_PLUGIN)
 libkiviotexttool_la_LIBADD = $(all_libraries) 
$(top_builddir)/kivio/kiviopart/libkiviopart.la
 
 rc_DATA = kiviotexttool.rc
--- kivio/plugins/kiviozoomtool/Makefile.am	2001/10/05 01:43:16	1.8
+++ kivio/plugins/kiviozoomtool/Makefile.am	2002/07/05 11:01:40
@@ -3,7 +3,7 @@
 #### WARNING! All changes made in this part will be lost! ####
 ##############################################################
 SUBDIRS = zoom_pics 
-lib_LTLIBRARIES =libkiviozoomtool.la
+kde_module_LTLIBRARIES =libkiviozoomtool.la
 
 INCLUDES = -I$(top_srcdir)/kivio/kiviopart\
 	-I$(top_srcdir)/kivio/kiviopart/kiviosdk\
@@ -24,7 +24,7 @@ EXTRA_DIST = \
 ##############################################################
 ####                  END KDEStudio part                  ####
 #2########################################################!@#$
-libkiviozoomtool_la_LDFLAGS = -avoid-version -module -no-undefined
+libkiviozoomtool_la_LDFLAGS = -module $(KDE_PLUGIN)
 libkiviozoomtool_la_LIBADD = $(all_libraries) 
$(top_builddir)/kivio/kiviopart/libkiviopart.la
 
 rc_DATA = kiviozoomtool.rc


_______________________________________________
koffice-devel mailing list
koffice-devel@mail.kde.org
http://mail.kde.org/mailman/listinfo/koffice-devel
[prev in list] [next in list] [prev in thread] [next in thread]