diff options
| author | David Tardon <dtardon@redhat.com> | 2013-05-24 15:16:58 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-05-24 16:52:02 +0200 |
| commit | 07e1da75a4ee94910ceb5e72d8ff20ac52a51a8d (patch) | |
| tree | c46aaaf2e3c1e56cb23e53811d9aaae398cdaf02 | |
| parent | e9c48a952d189701f2ccb201dbb450891a38c39f (diff) | |
kill and bury $(OUTDIR)/inc
Change-Id: Ifaac9bd368cb62abba5ebea315939c91856d0ee0
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | redland/ExternalProject_raptor.mk | 2 | ||||
| -rw-r--r-- | redland/ExternalProject_redland.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/TargetLocations.mk | 2 |
4 files changed, 3 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index a7eaa935cc44..4f422ee6dc90 100644 --- a/configure.ac +++ b/configure.ac @@ -3964,7 +3964,7 @@ else INSTDIR=${BUILDDIR}/instdir/${INPATH} fi OUTDIR="${SOLARVER}/${INPATH}" -SOLARINC="-I. -I$SRC_ROOT/include -I${SOLARVER}/$INPATH/inc/external -I${SOLARVER}/$INPATH/inc $SOLARINC" +SOLARINC="-I. -I$SRC_ROOT/include $SOLARINC" AC_SUBST(COM) AC_SUBST(CPU) AC_SUBST(CPUNAME) diff --git a/redland/ExternalProject_raptor.mk b/redland/ExternalProject_raptor.mk index 88b8a0e1530d..a26ec7a362de 100644 --- a/redland/ExternalProject_raptor.mk +++ b/redland/ExternalProject_raptor.mk @@ -40,7 +40,7 @@ $(call gb_ExternalProject_get_state_target,raptor,build): LDFLAGS="-L$(OUTDIR)/lib \ $(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-rpath-link$(COMMA)$(OUTDIR)/lib -Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib") \ $(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl))" \ - CPPFLAGS="-I$(OUTDIR)/inc/external $(if $(SYSBASE),-I$(SYSBASE)/usr/include)" \ + CPPFLAGS="$(if $(SYSBASE),-I$(SYSBASE)/usr/include)" \ ./configure --disable-gtk-doc \ --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" \ --with-www=xml \ diff --git a/redland/ExternalProject_redland.mk b/redland/ExternalProject_redland.mk index 8e377775b7ff..927e8f5decd0 100644 --- a/redland/ExternalProject_redland.mk +++ b/redland/ExternalProject_redland.mk @@ -24,7 +24,6 @@ ifeq ($(OS),WNT) $(call gb_ExternalProject_get_state_target,redland,build): $(call gb_ExternalProject_run,build,\ CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \ - CPPFLAGS="-I$(OUTDIR)/inc/external" \ 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="" \ @@ -48,7 +47,7 @@ $(call gb_ExternalProject_get_state_target,redland,build): LDFLAGS="-L$(OUTDIR)/lib \ $(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib") \ $(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl))" \ - CPPFLAGS="-I$(OUTDIR)/inc/external $(if $(SYSBASE),-I$(SYSBASE)/usr/include)" \ + CPPFLAGS="$(if $(SYSBASE),-I$(SYSBASE)/usr/include)" \ PKG_CONFIG="" \ RAPTOR2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,raptor)/src" \ RAPTOR2_LIBS="-L$(OUTDIR)/lib -lraptor2 $(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-lxml2)" \ diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 9dd059fae5e9..3ed5aa0760c1 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -40,7 +40,6 @@ gb_Pagein_get_outdir_target = $(OUTDIR)/bin/pagein-$(1) gb_PackagePart_get_destinations = \ $(INSTDIR) \ $(OUTDIR)/bin \ - $(OUTDIR)/inc \ $(OUTDIR)/lib \ $(OUTDIR)/par \ $(OUTDIR)/pck \ @@ -419,6 +418,5 @@ gb_StaticLibrary_OUTDIRLOCATION = $(OUTDIR)/lib # static variables declared here because they are used globally gb_POLOCATION := $(SRCDIR)/translations/source -gb_EXTERNAL_HEADERS_DIR := $(OUTDIR)/inc/external # vim: set noet sw=4: |