diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2013-05-15 13:38:52 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2013-05-15 14:23:39 +0300 |
| commit | e78d3245487e9b140caa15b586374e413eba178a (patch) | |
| tree | 321ba37dc6277cb56e8cc8462c1f0345649a4a77 | |
| parent | 07976ee1de03ab558fd1fe6f921514c8250cee02 (diff) | |
Revert changes that are now unnecessary and pointless
This reverts commit a94dc2203539a1593b99778be16b2c664fd46daa.
This reverts commit 3baa1c8c9baf6bb35f9d2ff5e002a5403d2d4af4.
This reverts commit 4e312f0c90247ccaa138520aa9e080453ec90b64.
This reverts commit 050a51b69e89e230e157be52d8b23862f3c06ba8.
This reverts commit 9c2a1cb4351c8f80a27b7ba413ad382368387425.
| -rw-r--r-- | libmwaw/ExternalProject_libmwaw.mk | 1 | ||||
| -rw-r--r-- | libodfgen/ExternalProject_libodfgen.mk | 1 | ||||
| -rw-r--r-- | libvisio/ExternalProject_libvisio.mk | 1 | ||||
| -rw-r--r-- | libwpg/ExternalProject_libwpg.mk | 1 | ||||
| -rw-r--r-- | libwps/ExternalProject_libwps.mk | 1 |
5 files changed, 0 insertions, 5 deletions
diff --git a/libmwaw/ExternalProject_libmwaw.mk b/libmwaw/ExternalProject_libmwaw.mk index 3a0a8f0ed159..82b4a3dbe56e 100644 --- a/libmwaw/ExternalProject_libmwaw.mk +++ b/libmwaw/ExternalProject_libmwaw.mk @@ -32,7 +32,6 @@ $(call gb_ExternalProject_get_state_target,libmwaw,build) : --disable-werror \ CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS))" \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - $(if $(filter MSC,$(COM)),AR=lib.exe SED=sed.exe) \ && (cd $(EXTERNAL_WORKDIR)/src/lib && $(MAKE)) \ ) diff --git a/libodfgen/ExternalProject_libodfgen.mk b/libodfgen/ExternalProject_libodfgen.mk index 3c9d479efab3..3b0ce214b54d 100644 --- a/libodfgen/ExternalProject_libodfgen.mk +++ b/libodfgen/ExternalProject_libodfgen.mk @@ -33,7 +33,6 @@ $(call gb_ExternalProject_get_state_target,libodfgen,build) : --disable-weffc \ CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS))" \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - $(if $(filter MSC,$(COM)),SED=sed.exe) \ && (cd $(EXTERNAL_WORKDIR)/src && $(MAKE)) \ ) diff --git a/libvisio/ExternalProject_libvisio.mk b/libvisio/ExternalProject_libvisio.mk index 66c6a919a648..3a5ce50cfa5d 100644 --- a/libvisio/ExternalProject_libvisio.mk +++ b/libvisio/ExternalProject_libvisio.mk @@ -41,7 +41,6 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) : CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS)) \ $(if $(filter NO,$(SYSTEM_LIBXML)),-I$(call gb_UnpackedTarball_get_dir,xml2)/include)" \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - $(if $(filter MSC,$(COM)),AR=lib.exe AWK=awk.exe SED=sed.exe) \ && (cd $(EXTERNAL_WORKDIR)/src/lib && $(MAKE)) \ ) diff --git a/libwpg/ExternalProject_libwpg.mk b/libwpg/ExternalProject_libwpg.mk index 5c858cb6f642..226474cd4281 100644 --- a/libwpg/ExternalProject_libwpg.mk +++ b/libwpg/ExternalProject_libwpg.mk @@ -30,7 +30,6 @@ $(call gb_ExternalProject_get_state_target,libwpg,build) : --disable-debug \ --disable-werror \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - $(if $(filter MSC,$(COM)),AR=lib.exe SED=sed.exe) \ && (cd $(EXTERNAL_WORKDIR)/src/lib && $(MAKE)) \ ) diff --git a/libwps/ExternalProject_libwps.mk b/libwps/ExternalProject_libwps.mk index 7b586c0f8e50..ba1bdb029de3 100644 --- a/libwps/ExternalProject_libwps.mk +++ b/libwps/ExternalProject_libwps.mk @@ -32,7 +32,6 @@ $(call gb_ExternalProject_get_state_target,libwps,build) : --disable-werror \ CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS))" \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - $(if $(filter MSC,$(COM)),AR=lib.exe SED=sed.exe) \ && (cd $(EXTERNAL_WORKDIR)/src/lib && $(MAKE)) \ ) |