From 663bc87911cb8d2d63b3f5b3791a1d0199db9f88 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Sat, 26 Apr 2014 00:39:46 +0100 Subject: allow for RISC OS extra libraries --- Makefile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 08971db..975e0a3 100644 --- a/Makefile +++ b/Makefile @@ -19,6 +19,8 @@ NSGENBIND_TARG := nsgenbind NSLIB_TARG := buildsystem libwapcaplet libparserutils libcss libhubbub libdom libnsbmp libnsgif librosprite libnsfb libsvgtiny +NSLIB_RO_TARG := librufl libpencil + # clean macro for each sub target define do_clean $(MAKE) distclean --directory=$1 TARGET=$(TARGET) @@ -38,6 +40,9 @@ $(TMP_PREFIX)/build-stamp: mkdir -p $(TMP_PREFIX)/lib mkdir -p $(TMP_PREFIX)/bin $(foreach L,$(NSLIB_TARG),$(call do_prefix_install,$(L))) +ifeq ($(TARGET),riscos) + $(foreach L,$(NSLIB_RO_TARG),$(call do_prefix_install,$(L))) +endif $(MAKE) install --directory=$(NSGENBIND_TARG) PREFIX=$(TMP_PREFIX) TARGET=$(shell uname -s) $(MAKE) --directory=$(NETSURF_TARG) PREFIX=$(PREFIX) TARGET=$(TARGET) touch $@ @@ -48,10 +53,13 @@ install: $(TMP_PREFIX)/build-stamp clean: $(RM) -r $(TMP_PREFIX) $(foreach L,$(NSLIB_TARG),$(call do_clean,$(L))) +ifeq ($(TARGET),riscos) + $(foreach L,$(NSLIB_RO_TARG),$(call do_clean,$(L))) +endif $(MAKE) clean --directory=$(NSGENBIND_TARG) TARGET=$(TARGET) $(MAKE) clean --directory=$(NETSURF_TARG) TARGET=$(TARGET) -release-checkout: $(NSLIB_TARG) $(NETSURF_TARG) $(NSGENBIND_TARG) +release-checkout: $(NSLIB_TARG) $(NETSURF_TARG) $(NSGENBIND_TARG) $(NSLIB_RO_TARG) for x in $^; do cd $$x; (git checkout origin/HEAD && git checkout $$(git describe --abbrev=0 --match="release/*" )); cd ..; done dist: -- cgit v1.2.3