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

List:       kde-commits
Subject:    kdenonbeta/kopete/protocols/jabber
From:       Martijn Klingens <klingens () kde ! org>
Date:       2003-08-27 12:29:08
[Download RAW message or body]

CVS commit by mklingens: 

Compile with builddir != srcdir

CCMAIL: Till Gerken <till@tantalo.net>


  M +3 -2      Makefile.am   1.35
  M +6 -1      libxmpp/xmpp/src/Makefile.am   1.4
  M +1 -1      ui/Makefile.am   1.26


--- kdenonbeta/kopete/protocols/jabber/Makefile.am  #1.34:1.35
@@ -2,6 +2,7 @@
 SUBDIRS = ui pixmaps icons libxmpp
 AM_CPPFLAGS = $(KOPETE_INCLUDES) \
-        -I$(top_builddir)/kopete/protocols/jabber/ui \
-        -I$(top_builddir)/kopete/protocols/jabber/libxmpp/xmpp/src \
+        -I$(srcdir)/libxmpp/xmpp/src \
+        -I$(srcdir)/ui \
+        -I./ui \
         $(all_includes)
 

--- kdenonbeta/kopete/protocols/jabber/ui/Makefile.am  #1.25:1.26
@@ -1,5 +1,5 @@
 METASOURCES = AUTO
 AM_CPPFLAGS = $(KOPETE_INCLUDES) \
-        -I../libxmpp/xmpp/src \
+        -I$(srcdir)/../libxmpp/xmpp/src \
         -I$(srcdir)/.. \
         $(all_includes)

--- kdenonbeta/kopete/protocols/jabber/libxmpp/xmpp/src/Makefile.am  #1.3:1.4
@@ -1,6 +1,10 @@
 METASOURCES = AUTO
 
+AM_CPPFLAGS = -I$(srcdir)/../../cutestuff/network \
+        -I$(srcdir)/../../cutestuff/util \
+        -I$(srcdir)/../../cutestuff/ssl \
+        $(all_includes)
+
 noinst_LTLIBRARIES = libxmpp.la
-INCLUDES = -I../../cutestuff/network -I../../cutestuff/util -I../../cutestuff/ssl $(all_includes)
 
 libxmpp_la_LDFLAGS = -avoid-version -module
@@ -22,2 +26,3 @@
         xmpp_xmlcommon.cpp \
         xmpp_xmlfilter.cpp
+


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