rules/sofia.am: defining INTERNAL_INCLUDES so it can be used from any subdir

utils/Makefile.am, libsofia-sip-ua/nua/Makefile.am: using INCLUDES from sofia.am

darcs-hash:20071129172110-65a35-058e3ba48638658fccfef410d980694f347480eb.gz

libsofia-sip-ua/nua/Makefile.am

@@ -8,22 +8,6 @@
 # ----------------------------------------------------------------------
 # Header paths
 
-INCLUDES = 		-I$(srcdir)/../bnf -I../bnf \
-	 		-I$(srcdir)/../ipt -I../ipt \
-	 		-I$(srcdir)/../iptsec -I../iptsec \
-	 		-I$(srcdir)/../http -I../http \
-			-I$(srcdir)/../msg -I../msg \
-			-I$(srcdir)/../nea -I../nea \
-			-I$(srcdir)/../nta -I../nta \
-			-I$(srcdir)/../nth -I../nth \
-			-I$(srcdir)/../sdp -I../sdp \
-			-I$(srcdir)/../sip -I../sip \
-			-I$(srcdir)/../soa -I../soa \
-			-I$(srcdir)/../tport -I../tport \
-			-I$(srcdir)/../stun -I../stun \
-			-I$(srcdir)/../url -I../url \
-			-I$(srcdir)/../su -I../su
-
 # ----------------------------------------------------------------------
 # Build targets
 
@@ -99,4 +83,6 @@ EXTRA_DIST =		nua.docs $(BUILT_SOURCES)
 
 include $(top_srcdir)/rules/sofia.am
 
+INCLUDES = ${INTERNAL_INCLUDES}
+
 TAG_DLL_FLAGS =		LIST=nua_tag_list

rules/sofia.am

 # common Makefile targets for libsofia-sip-ua(-glib) modules
 # ----------------------------------------------------------
 
+sofiasrcdir = ${top_srcdir}/libsofia-sip-ua
+sofiabuilddir = ${top_builddir}/libsofia-sip-ua
+
 AM_CFLAGS = $(CWFLAG) $(SOFIA_COVERAGE) $(SOFIA_CFLAGS) $(openssl_CFLAGS)
 
 SOFIA_COVERAGE = $(COVERAGE_FLAGS)
@@ -19,7 +22,7 @@ clean-built-sources:
 
 # rules for building tag files
 
-TAG_AWK=$(top_srcdir)/libsofia-sip-ua/su/tag_dll.awk
+TAG_AWK=${sofiasrcdir}/su/tag_dll.awk
 
 *_tag_ref.c: $(TAG_AWK)
 
@@ -36,25 +39,25 @@ _tag.c_tag_ref.c:
 	cd $(@D) && $(MAKE) $(@F)
 
 INTERNAL_INCLUDES = \
-	-I$(srcdir)/../features -I../features \
-	-I$(srcdir)/../ipt -I../ipt \
-	-I$(srcdir)/../iptsec -I../iptsec \
-	-I$(srcdir)/../bnf -I../bnf \
-	-I$(srcdir)/../http -I../http \
-	-I$(srcdir)/../msg -I../msg \
-	-I$(srcdir)/../nth -I../nth \
-	-I$(srcdir)/../nta -I../nta \
-	-I$(srcdir)/../nea -I../nea \
-	-I$(srcdir)/../nua -I../nua \
-	-I$(srcdir)/../soa -I../soa \
-	-I$(srcdir)/../sdp -I../sdp \
-	-I$(srcdir)/../sip -I../sip \
-	-I$(srcdir)/../soa -I../soa \
-	-I$(srcdir)/../sresolv -I../sresolv \
-	-I$(srcdir)/../tport -I../tport \
-	-I$(srcdir)/../stun -I../stun \
-	-I$(srcdir)/../url -I../url \
-	-I$(srcdir)/../su -I../su
+    -I${sofiasrcdir}/features -I${sofiabuilddir}/features \
+    -I${sofiasrcdir}/ipt -I${sofiabuilddir}/ipt \
+    -I${sofiasrcdir}/iptsec -I${sofiabuilddir}/iptsec \
+    -I${sofiasrcdir}/bnf -I${sofiabuilddir}/bnf \
+    -I${sofiasrcdir}/http -I${sofiabuilddir}/http \
+    -I${sofiasrcdir}/msg -I${sofiabuilddir}/msg \
+    -I${sofiasrcdir}/nth -I${sofiabuilddir}/nth \
+    -I${sofiasrcdir}/nta -I${sofiabuilddir}/nta \
+    -I${sofiasrcdir}/nea -I${sofiabuilddir}/nea \
+    -I${sofiasrcdir}/nua -I${sofiabuilddir}/nua \
+    -I${sofiasrcdir}/soa -I${sofiabuilddir}/soa \
+    -I${sofiasrcdir}/sdp -I${sofiabuilddir}/sdp \
+    -I${sofiasrcdir}/sip -I${sofiabuilddir}/sip \
+    -I${sofiasrcdir}/soa -I${sofiabuilddir}/soa \
+    -I${sofiasrcdir}/sresolv -I${sofiabuilddir}/sresolv \
+    -I${sofiasrcdir}/tport -I${sofiabuilddir}/tport \
+    -I${sofiasrcdir}/stun -I${sofiabuilddir}/stun \
+    -I${sofiasrcdir}/url -I${sofiabuilddir}/url \
+    -I${sofiasrcdir}/su -I${sofiabuilddir}/su
 
 PHONY = built-sources clean-built-sources
 
@@ -63,4 +66,3 @@ include $(top_srcdir)/rules/valcheck.am
 if HAVE_LCOV
 include $(top_srcdir)/rules/lcov.am
 endif
-

utils/Makefile.am

@@ -10,31 +10,9 @@
 # ----------------------------------------------------------------------
 # Header paths
 
-sofiasrc=$(top_srcdir)/libsofia-sip-ua
-sofiabld=$(top_builddir)/libsofia-sip-ua
-
-INCLUDES = 	-I$(sofiasrc)/features -I$(sofiabld)/features \
-		-I$(sofiasrc)/ipt -I$(sofiabld)/ipt \
-		-I$(sofiasrc)/iptsec -I$(sofiabld)/iptsec \
-		-I$(sofiasrc)/bnf -I$(sofiabld)/bnf \
-		-I$(sofiasrc)/http -I$(sofiabld)/http \
-		-I$(sofiasrc)/msg -I$(sofiabld)/msg \
-		-I$(sofiasrc)/nth -I$(sofiabld)/nth \
-		-I$(sofiasrc)/nta -I$(sofiabld)/nta \
-		-I$(sofiasrc)/nea -I$(sofiabld)/nea \
-		-I$(sofiasrc)/nua -I$(sofiabld)/nua \
-		-I$(sofiasrc)/soa -I$(sofiabld)/soa \
-		-I$(sofiasrc)/sdp -I$(sofiabld)/sdp \
-		-I$(sofiasrc)/sip -I$(sofiabld)/sip \
-		-I$(sofiasrc)/soa -I$(sofiabld)/soa \
-		-I$(sofiasrc)/sresolv -I$(sofiabld)/sresolv \
-		-I$(sofiasrc)/tport -I$(sofiabld)/tport \
-		-I$(sofiasrc)/stun -I$(sofiabld)/stun \
-		-I$(sofiasrc)/url -I$(sofiabld)/url \
-		-I$(sofiasrc)/su -I$(sofiabld)/su
-
-
-AM_CFLAGS =		$(SOFIA_CFLAGS)
+include $(top_srcdir)/rules/sofia.am
+
+INCLUDES = 	${INTERNAL_INCLUDES}
 
 # ----------------------------------------------------------------------
 # Build targets