X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=Makefile;h=49a995426246cbd9dbb053f8b6283a523f5876da;hb=2bb1be098155aa322c0771fa21b8c977243895a5;hp=9297c2e7ef92af2de24807806cd3cb3f276b5b44;hpb=ee8f903269128a8c69204609f052318538ce2d06;p=lgpl%2Fargeo-commons.git diff --git a/Makefile b/Makefile index 9297c2e7e..49a995426 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,10 @@ include sdk.mk .PHONY: clean all osgi jni -all: osgi jni +all: osgi jni move-rap + $(MAKE) -f Makefile-rcp.mk + +move-rap: mkdir -p $(A2_OUTPUT)/$(A2_CATEGORY).eclipse.rap mv -v $(A2_OUTPUT)/$(A2_CATEGORY)/*.rap.$(MAJOR).$(MINOR).jar $(A2_OUTPUT)/$(A2_CATEGORY).eclipse.rap touch $(BUILD_BASE)/*.rap/bnd.bnd @@ -54,5 +57,6 @@ jni: clean: rm -rf $(BUILD_BASE) $(MAKE) -C jni clean + $(MAKE) -f Makefile-rcp.mk clean -include $(SDK_SRC_BASE)/sdk/osgi.mk \ No newline at end of file +include $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk \ No newline at end of file