projects
/
lgpl
/
argeo-commons.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change Argeo Init branch in systemd
[lgpl/argeo-commons.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index f19a0dc4b61f068b55f7d516f1eb2f53264e8a2b..daea875a629bd12ee51897e7a098929ebfcd2f80 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-2,6
+2,9
@@
include sdk.mk
.PHONY: clean all osgi jni
all: osgi jni
.PHONY: clean all osgi jni
all: osgi jni
+ 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
A2_CATEGORY = org.argeo.cms
A2_CATEGORY = org.argeo.cms
@@
-37,7
+40,13
@@
A2_BASE = $(A2_OUTPUT)
VPATH = .:eclipse:rap:jcr
VPATH = .:eclipse:rap:jcr
-DEP_CATEGORIES = org.argeo.tp org.argeo.tp.apache org.argeo.tp.jetty org.argeo.tp.eclipse.equinox org.argeo.tp.eclipse.rap org.argeo.tp.jcr
+DEP_CATEGORIES = \
+org.argeo.tp \
+org.argeo.tp.apache \
+org.argeo.tp.jetty \
+org.argeo.tp.eclipse.equinox \
+org.argeo.tp.eclipse.rap \
+org.argeo.tp.jcr
jni:
$(MAKE) -C jni
jni:
$(MAKE) -C jni
@@
-46,4
+55,4
@@
clean:
rm -rf $(BUILD_BASE)
$(MAKE) -C jni clean
rm -rf $(BUILD_BASE)
$(MAKE) -C jni 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