summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Foley <pefoley2@verizon.net>2013-03-15 19:28:27 -0400
committerPeter Foley <pefoley2@verizon.net>2013-03-15 20:25:09 -0400
commitca05c3a209af742b3beae1029b1eb1c92cec2626 (patch)
tree617cc91230b223be69c465fa81bc8c76574b3ca6
parent7abc6baab1ce01011a0d3541c81216e2d6130ffa (diff)
move libmwaw to gcc-wrapper
Change-Id: Icad437f4c5622e1cc631b91ecb20913893514ffc
-rw-r--r--libmwaw/ExternalPackage_libmwaw.mk2
-rw-r--r--libmwaw/ExternalProject_libmwaw.mk34
2 files changed, 3 insertions, 33 deletions
diff --git a/libmwaw/ExternalPackage_libmwaw.mk b/libmwaw/ExternalPackage_libmwaw.mk
index b541498966b1..b6781297223d 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 17c2e47c4d32..452dd9287304 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: