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

List:       kde-commits
Subject:    kdenetwork/kopete/protocols/msn
From:       Martijn Klingens <klingens () kde ! org>
Date:       2003-08-29 14:03:24
[Download RAW message or body]

CVS commit by mklingens: 

Build MSN properly. Since libkopete_compat_kcdialog is linked into
libkopete it's not needed to add the compat lib for code that links to
libkopete anyway (i.e. the MSN plugin). Only use it for code that otherwise
won't link to it like the KCMs.

CCMAIL: kopete-devel@kde.org


  M +1 -4      Makefile.am   1.49
  M +2 -5      config/Makefile.am   1.3


--- kdenetwork/kopete/protocols/msn/Makefile.am  #1.48:1.49
@@ -3,6 +3,4 @@
 AM_CPPFLAGS = -I$(srcdir)/ui \
         -I./ui \
-        -I$(top_srcdir)/kopete/libkopete/compat \
-        -I$(top_srcdir)/kopete/libkopete/compat/kcdialog \
         $(KOPETE_INCLUDES) \
         $(all_includes)
@@ -14,6 +12,5 @@
         msnnotifysocket.cpp msnswitchboardsocket.cpp msnfiletransfersocket.cpp \
msninvitation.cpp  kopete_msn_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) \
                $(all_libraries)
-kopete_msn_la_LIBADD  = ./ui/libkopetemsnui.la \
-        ../../libkopete/libkopete.la ../../libkopete/compat/libkopetecompat.la \
$(LIB_KIO) +kopete_msn_la_LIBADD  = ./ui/libkopetemsnui.la \
../../libkopete/libkopete.la $(LIB_KIO)  
 service_DATA = msn.desktop

--- kdenetwork/kopete/protocols/msn/config/Makefile.am  #1.2:1.3
@@ -1,7 +1,4 @@
 METASOURCES = AUTO
-AM_CPPFLAGS = $(KOPETE_INCLUDES) \
-        -I$(top_srcdir)/kopete/libkopete/compat \
-        -I$(top_srcdir)/kopete/libkopete/compat/kcdialog \
-        $(all_includes)
+AM_CPPFLAGS = $(KOPETE_INCLUDES) $(all_includes)
 
 kde_module_LTLIBRARIES = kcm_kopete_msn.la
@@ -9,5 +6,5 @@
 kcm_kopete_msn_la_SOURCES = msnprefs.ui msnpreferences.cpp
 kcm_kopete_msn_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
-kcm_kopete_msn_la_LIBADD  =  \
../../../libkopete/compat/kcdialog/libkopetecompat_kcdialog.la  $(LIB_KUTILS)  \
+kcm_kopete_msn_la_LIBADD  = $(LIB_KOPETECOMPAT) $(LIB_KUTILS)  
 service_DATA = kopete_msn_config.desktop


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