diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-03-16 10:25:57 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-03-16 14:09:29 -0400 |
| commit | d956ddc54c486e24505029b9bdac314416b256d6 (patch) | |
| tree | 3023278601504da87fcb1e7af7365d2bbfb8b30f /libwpd | |
| parent | 2eaf9fd4e0643d348df57114def27ccea3afa665 (diff) | |
move libwpd to gcc-wrapper
Change-Id: I4ebe006d0e8850d7229de7a59e424fa819ca7700
Diffstat (limited to 'libwpd')
| -rw-r--r-- | libwpd/ExternalPackage_libwpd.mk | 2 | ||||
| -rw-r--r-- | libwpd/ExternalProject_libwpd.mk | 24 |
2 files changed, 3 insertions, 23 deletions
diff --git a/libwpd/ExternalPackage_libwpd.mk b/libwpd/ExternalPackage_libwpd.mk index f2375d190c43..ae1b029c815b 100644 --- a/libwpd/ExternalPackage_libwpd.mk +++ b/libwpd/ExternalPackage_libwpd.mk @@ -29,7 +29,7 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,libwpd,inc/external/libwpd-s $(eval $(call gb_ExternalPackage_use_external_project,libwpd,libwpd)) ifeq ($(OS)$(COM),WNTMSC) -$(eval $(call gb_ExternalPackage_add_file,libwpd,lib/wpd-0.9.lib,build/win32/Release/lib/libwpd-0.9.lib)) +$(eval $(call gb_ExternalPackage_add_file,libwpd,lib/wpd-0.9.lib,src/lib/.libs/libwpd-0.9.lib)) else $(eval $(call gb_ExternalPackage_add_file,libwpd,lib/libwpd-0.9.a,src/lib/.libs/libwpd-0.9.a)) endif diff --git a/libwpd/ExternalProject_libwpd.mk b/libwpd/ExternalProject_libwpd.mk index f015c4964c0b..0f20be7292f6 100644 --- a/libwpd/ExternalProject_libwpd.mk +++ b/libwpd/ExternalProject_libwpd.mk @@ -11,30 +11,12 @@ $(eval $(call gb_ExternalProject_ExternalProject,libwpd)) $(eval $(call gb_ExternalProject_use_unpacked,libwpd,wpd)) +$(eval $(call gb_ExternalProject_use_autoconf,libwpd,build)) + $(eval $(call gb_ExternalProject_register_targets,libwpd,\ build \ )) -ifeq ($(OS)$(COM),WNTMSC) - -ifeq ($(VCVER),90) -$(call gb_ExternalProject_get_state_target,libwpd,build) : - $(call gb_ExternalProject_run,build,\ - $(COMPATH)/vcpackages/vcbuild.exe libwpd.vcproj "Release|Win32" \ - ,build/win32) -else ifeq ($(VCVER),100) -$(call gb_ExternalProject_get_state_target,libwpd,build) : - $(call gb_ExternalProject_run,build,\ - msbuild.exe libwpd.vcxproj /p:Configuration=Release \ - ,build/win32) -else -$(call gb_ExternalProject_get_state_target,libwpd,build) : - $(call gb_ExternalProject_run,build,\ - msbuild.exe libwpd.vcxproj /p:PlatformToolset=v110 /p:VisualStudioVersion=11.0 /p:TargetName=libwpd-0.9 /p:Configuration=Release \ - ,build/win32) -endif -else - $(call gb_ExternalProject_get_state_target,libwpd,build) : $(call gb_ExternalProject_run,build,\ $(if $(filter TRUE,$(DISABLE_DYNLOADING)),CFLAGS="$(CFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)" CXXFLAGS="$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)") \ @@ -50,6 +32,4 @@ $(call gb_ExternalProject_get_state_target,libwpd,build) : && $(MAKE) \ ) -endif - # vim: set noet sw=4 ts=4: |