patch: Makefile cleanup

Simon Hausmann hausmann at kde.org
Wed Nov 28 23:32:06 UTC 2001


Hi,

I just tried the 2_2 branch kdevelop and saw that it installs a hell
of a lot of shared libraries, for no apparent reason. Please review
the attached patch.

Simon
-------------- next part --------------
Index: Makefile.am
===================================================================
RCS file: /home/kde/kdevelop/kdevelop/Attic/Makefile.am,v
retrieving revision 1.82.2.13.2.63.2.2
diff -u -p -r1.82.2.13.2.63.2.2 Makefile.am
--- Makefile.am	2001/11/02 21:01:05	1.82.2.13.2.63.2.2
+++ Makefile.am	2001/11/28 22:22:27
@@ -1,7 +1,7 @@
 ####### kdevelop will overwrite this part!!! (begin)##########
 bin_PROGRAMS = kdevelop
 kdevelop_SOURCES = ctoolclass.cpp kdevsession.cpp clibpropdlgimpl.cpp clibpropdlg.ui ckonsolewidget.cpp docviewman.cpp ckdevelop.cpp ckdevelop_classview.cpp ckdevelop_noslot.cpp cprjoptionsdlg.cpp ckappwizard.cpp wzconnectdlg.ui ckdevelop_init.cpp main.cpp kstartuplogo.cpp kdevlistview.cpp grepdialog.cpp doctreeview.cpp dbgtoolbar.cpp dbgpsdlg.cpp ctreeview.cpp ctreehandler.cpp ctoolsconfigdlg.cpp crealfileview.cpp cproject.cpp coutputwidget.cpp cnewfiledlg.cpp cnewclassdlg.cpp cmakemanualdlgdata.cpp cmakemanualdlg.cpp clogfileview.cpp ckdevsetupdlg.cpp ckdevelop_whatsthis.cpp ckdevelop_project.cpp cclasstreehandler.cpp ckdevaccel.cpp cgrouppropertiesdlg.cpp cgeneratenewfile.cpp cfinddoctextdlg.cpp cfilepropdlg.cpp cexecuteargdlg.cpp ceditwidget.cpp cdoctreepropdlg.cpp cdocbrowser.cpp ccvaddfolderdlg.cpp cclonefunctiondlg.cpp cclassview.cpp wzconnectdlgimpl.cpp cclasstooltreeview.cpp cclasstooldlg.cpp caddnewtranslationdlg.cpp caddexistingfiledlg.cpp caddclassmethoddlg.cpp caddclassattributedlg.cpp 
-kdevelop_LDADD   = ./vc/libkdevelopvc.la ./kwrite/libkdevelopkwrite.la ./gfxview/libkdevelopgfxview.la ./dbg/libkdevelopdbg.la ./classwizard/libclasswizard.a ./kpp/libkdevelopkpp.la ./classparser/libclassparser.a ./ctags/libctags.a ./setup/libkdevelopsetup.la ./widgets/qextmdi/src/libkdevelopqextmdi.la $(LEXLIB) $(LIB_KFILE) $(LIB_KHTML) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIB_KFILE) $(LIB_KHTML) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET)
+kdevelop_LDADD   = ./vc/libkdevelopvc.la ./kwrite/libkdevelopkwrite.la ./gfxview/libkdevelopgfxview.la ./dbg/libkdevelopdbg.la ./classwizard/libclasswizard.la ./kpp/libkdevelopkpp.la ./classparser/libclassparser.la ./ctags/libctags.la ./setup/libkdevelopsetup.la ./widgets/qextmdi/src/libkdevelopqextmdi.la $(LEXLIB) $(LIB_KHTML) $(LIBSOCKET)
 
 SUBDIRS = classparser kpp classwizard dbg examples gfxview kwrite pics templates tools vc widgets ctags setup 
 
Index: classparser/Makefile.am
===================================================================
RCS file: /home/kde/kdevelop/kdevelop/classparser/Attic/Makefile.am,v
retrieving revision 1.13.2.4.2.5.2.1
diff -u -p -r1.13.2.4.2.5.2.1 Makefile.am
--- classparser/Makefile.am	2001/08/26 17:19:38	1.13.2.4.2.5.2.1
+++ classparser/Makefile.am	2001/11/28 22:22:27
@@ -4,9 +4,9 @@ INCLUDES = $(all_includes)
 
 libclassparser_a_METASOURCES = AUTO
 
-noinst_LIBRARIES = libclassparser.a
+noinst_LTLIBRARIES = libclassparser.la
 
-libclassparser_a_SOURCES = tokenizer.cc main.cc PersistantClassStore.cc ParsedStruct.cc ParsedSignalSlot.cc ParsedScopeContainer.cc ParsedParent.cc ParsedMethod.cc ParsedItem.cc ParsedContainer.cc ParsedClassContainer.cc ParsedClass.cc ParsedAttribute.cc ParsedArgument.cc ClassTreeNode.cc ClassStore.cc ClassParser.cc 
+libclassparser_la_SOURCES = tokenizer.cc main.cc PersistantClassStore.cc ParsedStruct.cc ParsedSignalSlot.cc ParsedScopeContainer.cc ParsedParent.cc ParsedMethod.cc ParsedItem.cc ParsedContainer.cc ParsedClassContainer.cc ParsedClass.cc ParsedAttribute.cc ParsedArgument.cc ClassTreeNode.cc ClassStore.cc ClassParser.cc 
 
 
 EXTRA_DIST = ClassParser.cc ClassParser.h ClassStore.cc ClassStore.h ClassTreeNode.cc ClassTreeNode.h ParsedArgument.cc ParsedArgument.h ParsedAttribute.cc ParsedAttribute.h ParsedClass.cc ParsedClass.h ParsedClassContainer.cc ParsedClassContainer.h ParsedContainer.cc ParsedContainer.h ParsedItem.cc ParsedItem.h ParsedMethod.cc ParsedMethod.h ParsedParent.cc ParsedParent.h ParsedScopeContainer.cc ParsedScopeContainer.h ParsedSignalSlot.cc ParsedSignalSlot.h ParsedStruct.cc ParsedStruct.h PersistantClassStore.cc PersistantClassStore.h classparser.dia ProgrammingByContract.h tokenizer.l main.cc tokenizer.h tokenizer.cc 
Index: classwizard/Makefile.am
===================================================================
RCS file: /home/kde/kdevelop/kdevelop/classwizard/Attic/Makefile.am,v
retrieving revision 1.2.4.2
diff -u -p -r1.2.4.2 Makefile.am
--- classwizard/Makefile.am	2001/04/13 21:34:34	1.2.4.2
+++ classwizard/Makefile.am	2001/11/28 22:22:27
@@ -2,11 +2,11 @@
 
 INCLUDES = $(all_includes)
 
-libclasswizard_a_METASOURCES = AUTO
+libclasswizard_la_METASOURCES = AUTO
 
-noinst_LIBRARIES = libclasswizard.a
+noinst_LTLIBRARIES = libclasswizard.la
 
-libclasswizard_a_SOURCES = ccwvirtualmethodview.cpp cclasswizarddlg.cpp 
+libclasswizard_la_SOURCES = ccwvirtualmethodview.cpp cclasswizarddlg.cpp 
 
 
 EXTRA_DIST = cclasswizarddlg.cpp cclasswizarddlg.h ccwvirtualmethodview.cpp ccwvirtualmethodview.h 
Index: ctags/Makefile.am
===================================================================
RCS file: /home/kde/kdevelop/kdevelop/ctags/Attic/Makefile.am,v
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.2 Makefile.am
--- ctags/Makefile.am	2001/04/26 19:10:35	1.1.2.2
+++ ctags/Makefile.am	2001/11/28 22:22:27
@@ -2,11 +2,11 @@
 
 INCLUDES = $(all_includes)
 
-libctags_a_METASOURCES = AUTO
+libctags_la_METASOURCES = AUTO
 
-noinst_LIBRARIES = libctags.a
+noinst_LTLIBRARIES = libctags.la
 
-libctags_a_SOURCES = ctagsdialog_impl.cpp ctagsdialog.ui cctags_interf.cpp cctags.cpp 
+libctags_la_SOURCES = ctagsdialog_impl.cpp ctagsdialog.ui cctags_interf.cpp cctags.cpp 
 
 
 EXTRA_DIST = cctags.cpp cctags.h cctags_interf.h cctags_interf.cpp ctagsdialog.ui ctagsdialog_impl.cpp ctagsdialog_impl.h 
Index: dbg/Makefile.am
===================================================================
RCS file: /home/kde/kdevelop/kdevelop/dbg/Attic/Makefile.am,v
retrieving revision 1.1.2.3.2.13.2.1
diff -u -p -r1.1.2.3.2.13.2.1 Makefile.am
--- dbg/Makefile.am	2001/09/11 00:26:59	1.1.2.3.2.13.2.1
+++ dbg/Makefile.am	2001/11/28 22:22:27
@@ -1,5 +1,5 @@
 ####### kdevelop will overwrite this part!!! (begin)##########
-lib_LTLIBRARIES = libkdevelopdbg.la
+noinst_LTLIBRARIES = libkdevelopdbg.la
 
 
 INCLUDES = $(all_includes)
@@ -8,7 +8,8 @@ INCLUDES = $(all_includes)
 LDFLAGS = 
 
 
-libkdevelopdbg_la_LDFLAGS = -version-info 2:0
+libkdevelopdbg_la_LDFLAGS = $(all_libraries) -no-undefined
+libkdevelopdbg_la_LIBADD = $(LIB_KDEUI)
 
 libkdevelopdbg_la_METASOURCES = AUTO
 
Index: gfxview/Makefile.am
===================================================================
RCS file: /home/kde/kdevelop/kdevelop/gfxview/Attic/Makefile.am,v
retrieving revision 1.3.4.7
diff -u -p -r1.3.4.7 Makefile.am
--- gfxview/Makefile.am	2001/04/13 21:34:34	1.3.4.7
+++ gfxview/Makefile.am	2001/11/28 22:22:27
@@ -1,5 +1,5 @@
 ####### kdevelop will overwrite this part!!! (begin)##########
-lib_LTLIBRARIES = libkdevelopgfxview.la
+noinst_LTLIBRARIES = libkdevelopgfxview.la
 
 
 INCLUDES = $(all_includes)
@@ -8,7 +8,8 @@ INCLUDES = $(all_includes)
 LDFLAGS = 
 
 
-libkdevelopgfxview_la_LDFLAGS = -version-info 2:0
+libkdevelopgfxview_la_LDFLAGS = $(all_libraries) -no-undefined
+libkdevelopgfxview_la_LIBADD = $(LIB_KDECORE)
 
 libkdevelopgfxview_la_METASOURCES = AUTO
 
Index: kpp/Makefile.am
===================================================================
RCS file: /home/kde/kdevelop/kdevelop/kpp/Attic/Makefile.am,v
retrieving revision 1.1.2.21
diff -u -p -r1.1.2.21 Makefile.am
--- kpp/Makefile.am	2001/05/05 22:29:41	1.1.2.21
+++ kpp/Makefile.am	2001/11/28 22:22:28
@@ -1,5 +1,5 @@
 ####### kdevelop will overwrite this part!!! (begin)##########
-lib_LTLIBRARIES = libkdevelopkpp.la
+noinst_LTLIBRARIES = libkdevelopkpp.la
 
 
 INCLUDES = $(all_includes)
@@ -8,7 +8,8 @@ INCLUDES = $(all_includes)
 LDFLAGS = 
 
 
-libkdevelopkpp_la_LDFLAGS = -version-info 2:0
+libkdevelopkpp_la_LDFLAGS = $(all_libraries) -no-undefined
+libkdevelopkpp_la_LDFLAGS = $(LIB_KDECORE)
 
 libkdevelopkpp_la_METASOURCES = AUTO
 
Index: kwrite/Makefile.am
===================================================================
RCS file: /home/kde/kdevelop/kdevelop/kwrite/Attic/Makefile.am,v
retrieving revision 1.8.2.1.2.10
diff -u -p -r1.8.2.1.2.10 Makefile.am
--- kwrite/Makefile.am	2001/04/13 21:34:34	1.8.2.1.2.10
+++ kwrite/Makefile.am	2001/11/28 22:22:28
@@ -1,5 +1,5 @@
 ####### kdevelop will overwrite this part!!! (begin)##########
-lib_LTLIBRARIES = libkdevelopkwrite.la
+noinst_LTLIBRARIES = libkdevelopkwrite.la
 
 
 INCLUDES = $(all_includes)
@@ -8,7 +8,8 @@ INCLUDES = $(all_includes)
 LDFLAGS = 
 
 
-libkdevelopkwrite_la_LDFLAGS = -version-info 2:0
+libkdevelopkwrite_la_LDFLAGS = $(all_libraries) -no-undefined
+libkdevelopkwrite_la_LDFLAGS = $(LIB_KDECORE)
 
 libkdevelopkwrite_la_METASOURCES = AUTO
 
Index: setup/Makefile.am
===================================================================
RCS file: /home/kde/kdevelop/kdevelop/setup/Attic/Makefile.am,v
retrieving revision 1.1.2.3
diff -u -p -r1.1.2.3 Makefile.am
--- setup/Makefile.am	2001/06/29 11:26:55	1.1.2.3
+++ setup/Makefile.am	2001/11/28 22:22:28
@@ -1,5 +1,5 @@
 ####### kdevelop will overwrite this part!!! (begin)##########
-lib_LTLIBRARIES = libkdevelopsetup.la
+noinst_LTLIBRARIES = libkdevelopsetup.la
 
 
 INCLUDES = $(all_includes)
@@ -8,7 +8,8 @@ INCLUDES = $(all_includes)
 LDFLAGS = 
 
 
-libkdevelopsetup_la_LDFLAGS = -version-info 2:0
+libkdevelopsetup_la_LDFLAGS = $(all_libraries) -no-undefined
+libkdevelopsetup_la_LDFLAGS = $(LIB_KDECORE)
 
 libkdevelopsetup_la_METASOURCES = AUTO
 
Index: vc/Makefile.am
===================================================================
RCS file: /home/kde/kdevelop/kdevelop/vc/Attic/Makefile.am,v
retrieving revision 1.4.4.7
diff -u -p -r1.4.4.7 Makefile.am
--- vc/Makefile.am	2001/04/13 21:34:35	1.4.4.7
+++ vc/Makefile.am	2001/11/28 22:22:28
@@ -1,5 +1,5 @@
 ####### kdevelop will overwrite this part!!! (begin)##########
-lib_LTLIBRARIES = libkdevelopvc.la
+noinst_LTLIBRARIES = libkdevelopvc.la
 
 
 INCLUDES = $(all_includes)
@@ -8,7 +8,8 @@ INCLUDES = $(all_includes)
 LDFLAGS = 
 
 
-libkdevelopvc_la_LDFLAGS = -version-info 2:0
+libkdevelopvc_la_LDFLAGS = $(all_libraries) -no-undefined
+libkdevelopvc_la_LDFLAGS = $(LIB_KDECORE)
 
 libkdevelopvc_la_METASOURCES = AUTO
 
Index: widgets/qextmdi/src/Makefile.am
===================================================================
RCS file: /home/kde/kdevelop/kdevelop/widgets/qextmdi/src/Attic/Makefile.am,v
retrieving revision 1.7.2.4
diff -u -p -r1.7.2.4 Makefile.am
--- widgets/qextmdi/src/Makefile.am	2001/07/09 21:02:32	1.7.2.4
+++ widgets/qextmdi/src/Makefile.am	2001/11/28 22:22:28
@@ -8,8 +8,8 @@ EXTRA_DIST = qextmdichildarea.cpp qextmd
 
 INCLUDES = -I$(top_srcdir)/kdevelop/widgets/qextmdi/include -I$(top_srcdir)/kdevelop/widgets/qextmdi/res $(all_includes)
 
-lib_LTLIBRARIES = libkdevelopqextmdi.la
-libkdevelopqextmdi_la_LDFLAGS = $(all_libraries) -version-info 2:0
+noinst_LTLIBRARIES = libkdevelopqextmdi.la
+libkdevelopqextmdi_la_LDFLAGS = $(all_libraries) -no-undefined
 libkdevelopqextmdi_la_LIBADD  = $(LIB_KDEUI) $(LIB_KPARTS)
 
 libkdevelopqextmdi_la_SOURCES = qextmdichildarea.cpp qextmdichildfrm.cpp qextmdichildfrmcaption.cpp qextmdichildview.cpp qextmdimainfrm.cpp qextmditaskbar.cpp


More information about the KDevelop-devel mailing list