[Libreoffice-commits] core.git: 3 commits - libcdr/ExternalPackage_libcdr.mk libcdr/ExternalProject_libcdr.mk libmspub/ExternalPackage_libmspub.mk libmspub/ExternalProject_libmspub.mk libmwaw/ExternalPackage_libmwaw.mk libmwaw/ExternalProject_libmwaw.mk
Peter Foley
pefoley2 at verizon.net
Fri Mar 15 17:36:47 PDT 2013
libcdr/ExternalPackage_libcdr.mk | 4 +--
libcdr/ExternalProject_libcdr.mk | 43 ++---------------------------------
libmspub/ExternalPackage_libmspub.mk | 4 +--
libmspub/ExternalProject_libmspub.mk | 40 +-------------------------------
libmwaw/ExternalPackage_libmwaw.mk | 2 -
libmwaw/ExternalProject_libmwaw.mk | 34 +--------------------------
6 files changed, 12 insertions(+), 115 deletions(-)
New commits:
commit d3f62f190e454946ec6be518f6a440bb39b8f584
Author: Peter Foley <pefoley2 at verizon.net>
Date: Fri Mar 15 19:45:24 2013 -0400
move libmspub to gcc-wrapper
Change-Id: I44f1e53411e273575ebb97bf19c8a7a3ad2c313c
diff --git a/libmspub/ExternalPackage_libmspub.mk b/libmspub/ExternalPackage_libmspub.mk
index 83a0c87..3807c2b 100644
--- a/libmspub/ExternalPackage_libmspub.mk
+++ b/libmspub/ExternalPackage_libmspub.mk
@@ -17,8 +17,8 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,libmspub,inc/external/libmsp
$(eval $(call gb_ExternalPackage_use_external_project,libmspub,libmspub))
-ifeq ($(OS)$(COM),WNTMSC)
-$(eval $(call gb_ExternalPackage_add_file,libmspub,lib/mspub-0.0.lib,build/win32/Release/lib/libmspub-0.0.lib))
+ifeq ($(COM),MSC)
+$(eval $(call gb_ExternalPackage_add_file,libmspub,lib/mspub-0.0.lib,src/lib/.libs/libmspub-0.0.lib))
else
$(eval $(call gb_ExternalPackage_add_file,libmspub,lib/libmspub-0.0.a,src/lib/.libs/libmspub-0.0.a))
endif
diff --git a/libmspub/ExternalProject_libmspub.mk b/libmspub/ExternalProject_libmspub.mk
index 73ca1c6..bd93b40 100644
--- a/libmspub/ExternalProject_libmspub.mk
+++ b/libmspub/ExternalProject_libmspub.mk
@@ -11,6 +11,8 @@ $(eval $(call gb_ExternalProject_ExternalProject,libmspub))
$(eval $(call gb_ExternalProject_use_unpacked,libmspub,mspub))
+$(eval $(call gb_ExternalProject_use_autoconf,libmspub,build))
+
$(eval $(call gb_ExternalProject_register_targets,libmspub,\
build \
))
@@ -22,42 +24,6 @@ $(eval $(call gb_ExternalProject_use_externals,libmspub,\
wpg \
))
-ifeq ($(OS)$(COM),WNTMSC)
-
-ifeq ($(VCVER),90)
-$(call gb_ExternalProject_get_state_target,libmspub,build) :
- $(call gb_ExternalProject_run,build,\
- export BOOST_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,boost) \
- && export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \
- && export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \
- && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
- && export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \
- && $(COMPATH)/vcpackages/vcbuild.exe libmspub.vcproj "Release|Win32" \
- ,build/win32)
-else ifeq ($(VCVER),100)
-$(call gb_ExternalProject_get_state_target,libmspub,build) :
- $(call gb_ExternalProject_run,build,\
- export BOOST_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,boost) \
- && export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \
- && export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \
- && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
- && export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \
- && msbuild.exe libmspub.vcxproj /p:Configuration=Release \
- ,build/win32)
-else
-$(call gb_ExternalProject_get_state_target,libmspub,build) :
- $(call gb_ExternalProject_run,build,\
- export BOOST_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,boost) \
- && export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \
- && export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \
- && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
- && export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \
- && msbuild.exe libmspub.vcxproj /p:PlatformToolset=v110 /p:VisualStudioVersion=11.0 /p:Configuration=Release \
- ,build/win32)
-endif
-
-else
-
$(call gb_ExternalProject_get_state_target,libmspub,build) :
$(call gb_ExternalProject_run,build,\
export PKG_CONFIG="" \
@@ -77,6 +43,4 @@ $(call gb_ExternalProject_get_state_target,libmspub,build) :
&& (cd $(EXTERNAL_WORKDIR)/src/lib && $(MAKE)) \
)
-endif
-
# vim: set noet sw=4 ts=4:
commit ca05c3a209af742b3beae1029b1eb1c92cec2626
Author: Peter Foley <pefoley2 at verizon.net>
Date: Fri Mar 15 19:28:27 2013 -0400
move libmwaw to gcc-wrapper
Change-Id: Icad437f4c5622e1cc631b91ecb20913893514ffc
diff --git a/libmwaw/ExternalPackage_libmwaw.mk b/libmwaw/ExternalPackage_libmwaw.mk
index b541498..b678129 100644
--- a/libmwaw/ExternalPackage_libmwaw.mk
+++ b/libmwaw/ExternalPackage_libmwaw.mk
@@ -18,7 +18,7 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,libmwaw,inc/external/libmwaw
$(eval $(call gb_ExternalPackage_use_external_project,libmwaw,libmwaw))
ifeq ($(OS)$(COM),WNTMSC)
-$(eval $(call gb_ExternalPackage_add_file,libmwaw,lib/mwaw-0.1.lib,build/win32/Release/lib/libmwaw-0.1.lib))
+$(eval $(call gb_ExternalPackage_add_file,libmwaw,lib/mwaw-0.1.lib,src/lib/.libs/libmwaw-0.1.lib))
else
$(eval $(call gb_ExternalPackage_add_file,libmwaw,lib/libmwaw-0.1.a,src/lib/.libs/libmwaw-0.1.a))
endif
diff --git a/libmwaw/ExternalProject_libmwaw.mk b/libmwaw/ExternalProject_libmwaw.mk
index 17c2e47..452dd92 100644
--- a/libmwaw/ExternalProject_libmwaw.mk
+++ b/libmwaw/ExternalProject_libmwaw.mk
@@ -11,6 +11,8 @@ $(eval $(call gb_ExternalProject_ExternalProject,libmwaw))
$(eval $(call gb_ExternalProject_use_unpacked,libmwaw,mwaw))
+$(eval $(call gb_ExternalProject_use_autoconf,libmwaw,build))
+
$(eval $(call gb_ExternalProject_register_targets,libmwaw,\
build \
))
@@ -20,36 +22,6 @@ $(eval $(call gb_ExternalProject_use_externals,libmwaw,\
wpd \
))
-ifeq ($(OS)$(COM),WNTMSC)
-
-ifeq ($(VCVER),90)
-$(call gb_ExternalProject_get_state_target,libmwaw,build) :
- $(call gb_ExternalProject_run,build,\
- export BOOST_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,boost) \
- && export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \
- && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
- && $(COMPATH)/vcpackages/vcbuild.exe libmwaw.vcproj "Release|Win32" \
- ,build/win32)
-else ifeq ($(VCVER),100)
-$(call gb_ExternalProject_get_state_target,libmwaw,build) :
- $(call gb_ExternalProject_run,build,\
- export BOOST_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,boost) \
- && export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \
- && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
- && msbuild.exe libmwaw.vcxproj /p:Configuration=Release \
- ,build/win32)
-else
-$(call gb_ExternalProject_get_state_target,libmwaw,build) :
- $(call gb_ExternalProject_run,build,\
- export BOOST_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,boost) \
- && export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \
- && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
- && msbuild.exe libmwaw.vcxproj /p:PlatformToolset=v110 /p:VisualStudioVersion=11.0 /p:Configuration=Release \
- ,build/win32)
-endif
-
-else
-
$(call gb_ExternalProject_get_state_target,libmwaw,build) :
$(call gb_ExternalProject_run,build,\
export PKG_CONFIG="" \
@@ -65,6 +37,4 @@ $(call gb_ExternalProject_get_state_target,libmwaw,build) :
&& (cd $(EXTERNAL_WORKDIR)/src/lib && $(MAKE)) \
)
-endif
-
# vim: set noet sw=4 ts=4:
commit 7abc6baab1ce01011a0d3541c81216e2d6130ffa
Author: Peter Foley <pefoley2 at verizon.net>
Date: Fri Mar 15 19:12:08 2013 -0400
move libcdr to gcc-wrapper
Change-Id: Ic1e9c86e83f5896fdd90b3a66e392bfa2c4f77a6
diff --git a/libcdr/ExternalPackage_libcdr.mk b/libcdr/ExternalPackage_libcdr.mk
index d032e8f..4f08279 100644
--- a/libcdr/ExternalPackage_libcdr.mk
+++ b/libcdr/ExternalPackage_libcdr.mk
@@ -18,8 +18,8 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,libcdr,inc/external/libcdr,\
$(eval $(call gb_ExternalPackage_use_external_project,libcdr,libcdr))
-ifeq ($(OS)$(COM),WNTMSC)
-$(eval $(call gb_ExternalPackage_add_file,libcdr,lib/cdr-0.0.lib,build/win32/Release/lib/libcdr-0.0.lib))
+ifeq ($(COM),MSC)
+$(eval $(call gb_ExternalPackage_add_file,libcdr,lib/cdr-0.0.lib,src/lib/.libs/libcdr-0.0.lib))
else
$(eval $(call gb_ExternalPackage_add_file,libcdr,lib/libcdr-0.0.a,src/lib/.libs/libcdr-0.0.a))
endif
diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk
index 431b9b4..9da895b 100644
--- a/libcdr/ExternalProject_libcdr.mk
+++ b/libcdr/ExternalProject_libcdr.mk
@@ -11,6 +11,8 @@ $(eval $(call gb_ExternalProject_ExternalProject,libcdr))
$(eval $(call gb_ExternalProject_use_unpacked,libcdr,cdr))
+$(eval $(call gb_ExternalProject_use_autoconf,libcdr,build))
+
$(eval $(call gb_ExternalProject_register_targets,libcdr,\
build \
))
@@ -23,48 +25,11 @@ $(eval $(call gb_ExternalProject_use_externals,libcdr,\
zlib \
))
-ifeq ($(OS)$(COM),WNTMSC)
-
-ifeq ($(VCVER),90)
-$(call gb_ExternalProject_get_state_target,libcdr,build) :
- $(call gb_ExternalProject_run,build,\
- export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \
- && export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \
- && export LCMS2_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,lcms2/include) \
- && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
- && export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \
- && $(COMPATH)/vcpackages/vcbuild.exe libcdr.vcproj "Release|Win32" \
- ,build/win32)
-else ifeq ($(VCVER),100)
-$(call gb_ExternalProject_get_state_target,libcdr,build) :
- $(call gb_ExternalProject_run,build,\
- export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \
- && export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \
- && export LCMS2_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,lcms2/include) \
- && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
- && export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \
- && msbuild.exe libcdr.vcxproj /p:Configuration=Release \
- ,build/win32)
-else
-$(call gb_ExternalProject_get_state_target,libcdr,build) :
- $(call gb_ExternalProject_run,build,\
- export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \
- && export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \
- && export LCMS2_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,lcms2/include) \
- && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
- && export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \
- && msbuild.exe libcdr.vcxproj /p:PlatformToolset=v110 /p:VisualStudioVersion=11.0 /p:Configuration=Release \
- ,build/win32)
-endif
-
-else
-
$(call gb_ExternalProject_get_state_target,libcdr,build) :
$(call gb_ExternalProject_run,build,\
export PKG_CONFIG="" \
&& export ICU_LIBS=" " \
- $(if $(filter NO,$(SYSTEM_ICU)),&& export ICU_CFLAGS="-I$(OUTDIR)/inc/external") \
- $(if $(filter YES,$(SYSTEM_ICU)),&& export ICU_CFLAGS=" ") \
+ && export ICU_CFLAGS="$(if $(filter NO,$(SYSTEM_ICU)),-I$(OUTDIR)/inc/external)" \
&& ./configure \
--with-pic \
--enable-static \
@@ -76,6 +41,4 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) :
&& (cd $(EXTERNAL_WORKDIR)/src/lib && $(MAKE)) \
)
-endif
-
# vim: set noet sw=4 ts=4:
More information about the Libreoffice-commits
mailing list