mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kill and bury $(OUTDIR)/inc

Browse Source 
Change-Id: Ifaac9bd368cb62abba5ebea315939c91856d0ee0
This commit is contained in:
David Tardon
2013-05-24 15:16:58 +02:00
parent e9c48a952d
commit 07e1da75a4
4 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@@ -3964,7 +3964,7 @@ else
INSTDIR=${BUILDDIR}/instdir/${INPATH} INSTDIR=${BUILDDIR}/instdir/${INPATH}
fi fi
OUTDIR="${SOLARVER}/${INPATH}" 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(COM)
AC_SUBST(CPU) AC_SUBST(CPU)
AC_SUBST(CPUNAME) AC_SUBST(CPUNAME)

2
redland/ExternalProject_raptor.mk
View File

@@ -40,7 +40,7 @@ $(call gb_ExternalProject_get_state_target,raptor,build):
LDFLAGS="-L$(OUTDIR)/lib \ 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 $(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))" \ $(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 \ ./configure --disable-gtk-doc \
--enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" \ --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" \
--with-www=xml \ --with-www=xml \

3
redland/ExternalProject_redland.mk
View File

@@ -24,7 +24,6 @@ ifeq ($(OS),WNT)
$(call gb_ExternalProject_get_state_target,redland,build): $(call gb_ExternalProject_get_state_target,redland,build):
$(call gb_ExternalProject_run,build,\ $(call gb_ExternalProject_run,build,\
CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \ 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" \ LDFLAGS="-Wl$(COMMA)--no-undefined -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols -L$(OUTDIR)/lib" \
OBJDUMP="$(HOST_PLATFORM)-objdump" \ OBJDUMP="$(HOST_PLATFORM)-objdump" \
PKG_CONFIG="" \ PKG_CONFIG="" \
@@ -48,7 +47,7 @@ $(call gb_ExternalProject_get_state_target,redland,build):
LDFLAGS="-L$(OUTDIR)/lib \ LDFLAGS="-L$(OUTDIR)/lib \
$(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/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))" \ $(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="" \ PKG_CONFIG="" \
RAPTOR2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,raptor)/src" \ RAPTOR2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,raptor)/src" \
RAPTOR2_LIBS="-L$(OUTDIR)/lib -lraptor2 $(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-lxml2)" \ RAPTOR2_LIBS="-L$(OUTDIR)/lib -lraptor2 $(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-lxml2)" \

2
solenv/gbuild/TargetLocations.mk
View File

@@ -40,7 +40,6 @@ gb_Pagein_get_outdir_target = $(OUTDIR)/bin/pagein-$(1)
gb_PackagePart_get_destinations = \ gb_PackagePart_get_destinations = \
$(INSTDIR) \ $(INSTDIR) \
$(OUTDIR)/bin \ $(OUTDIR)/bin \
$(OUTDIR)/inc \
$(OUTDIR)/lib \ $(OUTDIR)/lib \
$(OUTDIR)/par \ $(OUTDIR)/par \
$(OUTDIR)/pck \ $(OUTDIR)/pck \
@@ -419,6 +418,5 @@ gb_StaticLibrary_OUTDIRLOCATION = $(OUTDIR)/lib
# static variables declared here because they are used globally # static variables declared here because they are used globally
gb_POLOCATION := $(SRCDIR)/translations/source gb_POLOCATION := $(SRCDIR)/translations/source
gb_EXTERNAL_HEADERS_DIR := $(OUTDIR)/inc/external
# vim: set noet sw=4: # vim: set noet sw=4: