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

List:       kde-commits
Subject:    koffice/kugar
From:       Laurent Montel <montel () kde ! org>
Date:       2006-09-07 12:45:06
Message-ID: 1157633106.054989.19490.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 581755 by mlaurent:

Clean up


 M  +0 -1      CMakeLists.txt  
 M  +2 -48     kudesigner/CMakeLists.txt  
 M  +1 -1      lib/CMakeLists.txt  


--- trunk/koffice/kugar/CMakeLists.txt #581754:581755
@@ -46,5 +46,4 @@
 
 
 kde4_install_icons( ${ICON_INSTALL_DIR}   )
-kde4_install_icons( ${ICON_INSTALL_DIR}   )
 
--- trunk/koffice/kugar/kudesigner/CMakeLists.txt #581754:581755
@@ -20,7 +20,7 @@
 
 kde4_add_library(kudesignercore SHARED ${kudesignercore_LIB_SRCS})
 
-target_link_libraries(kudesignercore  ${KDE4_KDEUI_LIBS} kofficeui \
${KDE4_KPARTS_LIBS} kofficecore koproperty ${KDE4_KIO_LIBS} ${KDE4_KDEPRINT_LIBS} ) \
+target_link_libraries(kudesignercore  kofficeui ${KDE4_KPARTS_LIBS} kofficecore \
koproperty ${KDE4_KIO_LIBS} ${KDE4_KDEPRINT_LIBS} )  
 set_target_properties(kudesignercore PROPERTIES VERSION \
${GENERIC_KOFFICE_LIB_VERSION} SOVERSION ${GENERIC_KOFFICE_LIB_SOVERSION} )  \
install(TARGETS kudesignercore  DESTINATION ${LIB_INSTALL_DIR}) @@ -36,7 +36,7 @@
 
 kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kudesignerpart )
 
-target_link_libraries(kudesignerpart  ${KDE4_KDECORE_LIBS} kudesignercore kofficeui \
${KDE4_KPARTS_LIBS} kofficecore ) +target_link_libraries(kudesignerpart  \
kudesignercore kofficeui ${KDE4_KPARTS_LIBS} kofficecore )  
 install(TARGETS kudesignerpart  DESTINATION ${PLUGIN_INSTALL_DIR})
 
@@ -64,49 +64,3 @@
 
 
 
-
-#original Makefile.am contents follow:
-
-#SUBDIRS = toolbar pics templates
-#
-#INCLUDES = -I$(srcdir)/../kudesigner_lib -I$(srcdir)/../lib \
-#	$(KOPROPERTY_INCLUDES) $(KOFFICE_INCLUDES) $(all_includes)
-#
-#bin_PROGRAMS =
-#
-#lib_LTLIBRARIES = libkudesignercore.la
-#libkudesignercore_la_SOURCES = kudesigner_view.cpp kudesigner_factory.cpp \
-#	kudesigner_doc.cpp
-#libkudesignercore_la_LDFLAGS = -avoid-version $(all_libraries) $(KDE_RPATH) \
                -no-undefined
-#libkudesignercore_la_LIBADD = ../kudesigner_lib/libkudesignercommon.la \
$(LIB_KOFFICEUI) $(LIB_KPARTS) $(LIB_KOFFICECORE) $(LIB_KOPROPERTY) $(LIB_KIO) \
                $(LIB_KDEPRINT)
-#
-### The part
-#kde_module_LTLIBRARIES = libkudesignerpart.la
-#libkudesignerpart_la_SOURCES = kudesigner_part.cpp
-#libkudesignerpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(KDE_RPATH)
-#libkudesignerpart_la_LIBADD = libkudesignercore.la $(LIB_KOFFICEUI) $(LIB_KPARTS) \
                $(LIB_KOFFICECORE)
-#
-### The kdeinit loadable module
-#kdeinit_LTLIBRARIES = kudesigner.la
-#kudesigner_la_SOURCES = main.cpp
-#kudesigner_la_LDFLAGS = $(all_libraries) -module -avoid-version
-#kudesigner_la_LIBADD = $(LIB_KOFFICECORE)
-#
-#appsdir = $(kde_appsdir)/Office
-#apps_DATA = kudesigner.desktop
-#
-#METASOURCES = AUTO
-#
-#rcdir = $(kde_datadir)/kudesigner
-#rc_DATA = kudesignerui.rc kudesigner_readonly.rc
-#
-#EXTRA_DIST = \
-#	kudesigner_aboutdata.h \
-#	kudesigner_factory.h \
-#	kudesigner_part.h \
-#	kudesigner_view.h \
-#	$(rc_DATA) \
-#	$(apps_DATA)
-#
-#KDE_CXXFLAGS = $(USE_EXCEPTIONS) -DKPROPERTY_EXPORT=
-#
--- trunk/koffice/kugar/lib/CMakeLists.txt #581754:581755
@@ -25,7 +25,7 @@
 
 kde4_add_library(kugarlib SHARED ${kugarlib_LIB_SRCS})
 
-target_link_libraries(kugarlib  ${KDE4_KDECORE_LIBS} ${KDE4_KDEPRINT_LIBS})
+target_link_libraries(kugarlib  ${KDE4_KDEPRINT_LIBS})
 
 set_target_properties(kugarlib PROPERTIES VERSION ${GENERIC_KOFFICE_LIB_VERSION} \
SOVERSION ${GENERIC_KOFFICE_LIB_SOVERSION} )  install(TARGETS kugarlib  DESTINATION \
${LIB_INSTALL_DIR})


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