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

List:       kde-commits
Subject:    kdeutils/kregexpeditor
From:       David Faure <faure () kde ! org>
Date:       2003-09-09 16:41:49
[Download RAW message or body]

CVS commit by faure: 

Doing Jesper a favor: creating a common shared lib so that the app doesn't
have to link to the module anymore. This only proves one thing: I'm a very bad
teacher (Makefile.am talk)


  A            kregexpeditorfactory.cpp   1.1 [LGPL]
  M +16 -9     Makefile.am   1.26


--- kdeutils/kregexpeditor/Makefile.am  #1.25:1.26
@@ -1,7 +1,7 @@
-kde_module_LTLIBRARIES = libkregexpeditorgui.la
-AM_CPPFLAGS = -DQT_NO_CAST_ASCII
 SUBDIRS = KWidgetStreamer KMultiFormListBox picts predefined
-INCLUDES = -I$(srcdir)/KWidgetStreamer -I$(srcdir)/KMultiFormListBox $(all_includes)
 
+AM_CPPFLAGS = -DQT_NO_CAST_ASCII -I$(srcdir)/KWidgetStreamer \
-I$(srcdir)/KMultiFormListBox $(all_includes) +
+# (useless)
 noinst_HEADERS = \
   kregexpeditorgui.h editorwindow.h regexpwidget.h drag.h limitedcharlineedit.h \
regexp.h selectablelineedit.h      \ @@ -13,5 +13,7 @@
   regexpconverter.h qtregexpconverter.h emacsregexpconverter.h regexphighlighter.h
 
-libkregexpeditorgui_la_SOURCES = \
+# The library contains all the code that is shared between the module and the app
+lib_LTLIBRARIES = libkregexpeditorcommon.la
+libkregexpeditorcommon_la_SOURCES = \
   kregexpeditorgui.cpp editorwindow.cpp regexpwidget.cpp drag.cpp  concwidget.cpp  \
zerowidgets.cpp dragaccepter.cpp \  repeatwidget.cpp characterswidget.cpp \
altnwidget.cpp limitedcharlineedit.cpp  textregexp.cpp textrangeregexp.cpp  \ @@ \
-24,8 +26,7 @@  emacsregexpconverter.cpp regexphighlighter.cpp
 
-
-libkregexpeditorgui_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-libkregexpeditorgui_la_LIBADD = KMultiFormListBox/libkmultiformlistbox.la \
-        KWidgetStreamer/libkwidgetstreamer.la $(LIB_KIO) 
+libkregexpeditorcommon_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 \
-no-undefined +libkregexpeditorcommon_la_LIBADD = \
KMultiFormListBox/libkmultiformlistbox.la \ +        \
KWidgetStreamer/libkwidgetstreamer.la $(LIB_KIO)  
 METASOURCES = AUTO
@@ -34,4 +35,10 @@
 servicedir = $(kde_servicesdir)
 
+#### The dynamically-loadable module (its interface is defined in kdelibs)
+kde_module_LTLIBRARIES = libkregexpeditorgui.la
+libkregexpeditorgui_la_SOURCES = kregexpeditorfactory.cpp
+libkregexpeditorgui_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+libkregexpeditorgui_la_LIBADD = libkregexpeditorcommon.la
+
 #### Binary
 
@@ -39,5 +46,5 @@
 kregexpeditor_SOURCES = main.cpp
 kregexpeditor_LDFLAGS = $(all_libraries)
-kregexpeditor_LDADD =  libkregexpeditorgui.la $(LIB_KIO) 
+kregexpeditor_LDADD =  libkregexpeditorcommon.la $(LIB_KIO)
 kregexpeditor_INCLUDES =  $(all_includes)
 


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