redland: stop delivering headers

Change-Id: I6233b68d795660b1dfe1435f06c31f754efbe7f5

5 files changed, 7 insertions, 12 deletions

diff --git a/redland/ExternalPackage_raptor.mk b/redland/ExternalPackage_raptor.mk
index a80e69eb75be..20041736c6a7 100644
--- a/redland/ExternalPackage_raptor.mk
+++ b/redland/ExternalPackage_raptor.mk
@@ -27,7 +27,4 @@ $(eval $(call gb_ExternalPackage_add_file,raptor,lib/libraptor2-lo.so.$(RAPTOR_M
 $(eval $(call gb_ExternalPackage_add_file,raptor,lib/libraptor2.so,src/.libs/libraptor2-lo.so.$(RAPTOR_MAJOR).0.0))
 endif
 
-$(eval $(call gb_ExternalPackage_add_file,raptor,inc/external/raptor2.h,src/raptor2.h))
-$(eval $(call gb_ExternalPackage_add_file,raptor,inc/external/raptor.h,src/raptor.h))
-
 # vim: set noet sw=4 ts=4:
diff --git a/redland/ExternalPackage_rasqal.mk b/redland/ExternalPackage_rasqal.mk
index 96280b38ebee..8a09bf19c885 100644
--- a/redland/ExternalPackage_rasqal.mk
+++ b/redland/ExternalPackage_rasqal.mk
@@ -27,6 +27,4 @@ $(eval $(call gb_ExternalPackage_add_file,rasqal,lib/librasqal-lo.so.$(RASQAL_MA
 $(eval $(call gb_ExternalPackage_add_file,rasqal,lib/librasqal.so,src/.libs/librasqal-lo.so.$(RASQAL_MAJOR).0.0))
 endif
 
-$(eval $(call gb_ExternalPackage_add_file,rasqal,inc/external/rasqal.h,src/rasqal.h))
-
 # vim: set noet sw=4 ts=4:
diff --git a/redland/ExternalProject_rasqal.mk b/redland/ExternalProject_rasqal.mk
index 2f550e203c58..7576b05b423a 100644
--- a/redland/ExternalProject_rasqal.mk
+++ b/redland/ExternalProject_rasqal.mk
@@ -30,7 +30,7 @@ $(call gb_ExternalProject_get_state_target,rasqal,build):
 		XSLTLIB="$(if $(filter YES,$(SYSTEM_LIBXSLT)),$(LIBXSLT_LIBS),-lxslt)" \
 		OBJDUMP="$(HOST_PLATFORM)-objdump" \
 		PKG_CONFIG="" \
-		RAPTOR2_CFLAGS="-I$(OUTDIR)/inc/external" \
+		RAPTOR2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,raptor)/src" \
 		RAPTOR2_LIBS="-L$(OUTDIR)/lib -lraptor2" \
 		./configure --disable-static --enable-shared --disable-gtk-doc \
 			--disable-pcre \
@@ -52,7 +52,7 @@ $(call gb_ExternalProject_get_state_target,rasqal,build):
 		$(if $(filter MACOSXNO,$(OS)$(SYSTEM_LIBXML)),-Wl$(COMMA)-dylib_file$(COMMA)@loader_path/../ure-link/lib/libxml2.2.dylib:$(OUTDIR)/lib/libxml2.2.dylib)" \
 		$(if $(SYSBASE),CPPFLAGS="-I$(SYSBASE)/usr/include") \
 		PKG_CONFIG="" \
-		RAPTOR2_CFLAGS="-I$(OUTDIR)/inc/external" \
+		RAPTOR2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,raptor)/src" \
 		RAPTOR2_LIBS="-L$(OUTDIR)/lib -lraptor2" \
 		./configure --disable-gtk-doc \
 			--with-regex-library=posix \
diff --git a/redland/ExternalProject_redland.mk b/redland/ExternalProject_redland.mk
index 59c171f236b0..e75d11f92d33 100644
--- a/redland/ExternalProject_redland.mk
+++ b/redland/ExternalProject_redland.mk
@@ -32,9 +32,9 @@ $(call gb_ExternalProject_get_state_target,redland,build):
 		LDFLAGS="-Wl$(COMMA)--no-undefined -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols -L$(OUTDIR)/lib" \
 		OBJDUMP="$(HOST_PLATFORM)-objdump" \
 		PKG_CONFIG="" \
-		RAPTOR2_CFLAGS="-I$(OUTDIR)/inc/external" \
+		RAPTOR2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,raptor)/src" \
 		RAPTOR2_LIBS="-L$(OUTDIR)/lib -lraptor2  $(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-lxml2)" \
-		RASQAL_CFLAGS="-I$(OUTDIR)/inc/external" \
+		RASQAL_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,rasqal)/src" \
 		RASQAL_LIBS="-L$(OUTDIR)/lib -lrasqal" \
 		./configure --disable-static --disable-gtk-doc \
 			--disable-modular \
@@ -55,9 +55,9 @@ $(call gb_ExternalProject_get_state_target,redland,build):
 		$(if $(filter NO,$(SYSTEM_LIBXML)),-Wl$(COMMA)-dylib_file$(COMMA)@loader_path/../ure-link/lib/libxml2.2.dylib:$(OUTDIR)/lib/libxml2.2.dylib))" \
 		CPPFLAGS="-I$(OUTDIR)/inc/external $(if $(SYSBASE),-I$(SYSBASE)/usr/include)" \
 		PKG_CONFIG="" \
-		RAPTOR2_CFLAGS="-I$(OUTDIR)/inc/external" \
+		RAPTOR2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,raptor)/src" \
 		RAPTOR2_LIBS="-L$(OUTDIR)/lib -lraptor2  $(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-lxml2)" \
-		RASQAL_CFLAGS="-I$(OUTDIR)/inc/external" \
+		RASQAL_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,rasqal)/src" \
 		RASQAL_LIBS="-L$(OUTDIR)/lib -lrasqal" \
 		./configure --disable-gtk-doc \
 			--disable-modular \
diff --git a/redland/Module_redland.mk b/redland/Module_redland.mk
index 5b1f2a12230d..431a66da5323 100644
--- a/redland/Module_redland.mk
+++ b/redland/Module_redland.mk
@@ -20,7 +20,7 @@ $(eval $(call gb_Module_add_targets,redland,\
 	Library_raptor \
 	Library_rasqal \
 	Library_rdf \
-))	
+))
 else
 $(eval $(call gb_Module_add_targets,redland,\
 	ExternalPackage_raptor \