diff options
Diffstat (limited to 'tools/depends/target')
| -rw-r--r-- | tools/depends/target/expat/EXPAT-VERSION | 1 | ||||
| -rw-r--r-- | tools/depends/target/expat/Makefile | 27 |
2 files changed, 14 insertions, 14 deletions
diff --git a/tools/depends/target/expat/EXPAT-VERSION b/tools/depends/target/expat/EXPAT-VERSION index 1e5a9b7415..0fc058485e 100644 --- a/tools/depends/target/expat/EXPAT-VERSION +++ b/tools/depends/target/expat/EXPAT-VERSION @@ -3,3 +3,4 @@ VERSION=2.4.7 SOURCE=$(LIBNAME)-$(VERSION) ARCHIVE=$(SOURCE).tar.xz SHA512=e1a16cd48fcd6c4974dc7058d2e0284e0f91565835ec93f16d3f2c79647124470e5edb9f88f1ab9df5f403883a527750a4d63b941bd26fd43c05cd6f42bdcc48 +BYPRODUCT=libexpat.a diff --git a/tools/depends/target/expat/Makefile b/tools/depends/target/expat/Makefile index 4e0ee9d875..a36631b05a 100644 --- a/tools/depends/target/expat/Makefile +++ b/tools/depends/target/expat/Makefile @@ -2,33 +2,32 @@ include ../../Makefile.include EXPAT-VERSION ../../download-files.include DEPS= ../../Makefile.include Makefile EXPAT-VERSION ../../download-files.include # configuration settings -CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) ./conftools; \ - ./configure --prefix=$(PREFIX) \ - --disable-shared \ - --without-examples \ - --without-tests \ - --without-xmlwf \ - --without-docbook +CMAKE_OPTIONS=-DEXPAT_BUILD_TOOLS=OFF \ + -DEXPAT_BUILD_EXAMPLES=OFF \ + -DEXPAT_BUILD_TESTS=OFF \ + -DEXPAT_SHARED_LIBS=OFF \ + -DEXPAT_BUILD_DOCS=OFF \ + -DEXPAT_BUILD_PKGCONFIG=ON -LIBDYLIB=$(PLATFORM)/lib/.libs/lib$(LIBNAME).a +LIBDYLIB=$(PLATFORM)/build/$(BYPRODUCT) all: .installed-$(PLATFORM) - $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE) $(DEPS) - rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM) + rm -rf $(PLATFORM); mkdir -p $(PLATFORM) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - cd $(PLATFORM); $(CONFIGURE) + cd $(PLATFORM); mkdir -p build + cd $(PLATFORM)/build; $(CMAKE) $(CMAKE_OPTIONS) .. $(LIBDYLIB): $(PLATFORM) - $(MAKE) -C $(PLATFORM) + $(MAKE) -C $(PLATFORM)/build .installed-$(PLATFORM): $(LIBDYLIB) - $(MAKE) -C $(PLATFORM) install + $(MAKE) -C $(PLATFORM)/build install touch $@ clean: - $(MAKE) -C $(PLATFORM) clean + $(MAKE) -C $(PLATFORM)/build clean rm -f .installed-$(PLATFORM) distclean:: |