Browse Source

Build system cleanup

Properly clean up object files and ignore all generated files
pull/13/head
David Lanzendörfer 3 years ago
parent
commit
71e3ae352a
  1. 1
      .gitignore
  2. 6
      Makefile
  3. 4
      src/Makefile
  4. 7
      test/java/foundation/pEp/jniadapter/test/Makefile
  5. 1
      test/java/foundation/pEp/pitytest/Makefile

1
.gitignore

@ -22,6 +22,7 @@ foundation_pEp_jniadapter_Message.*
foundation_pEp_jniadapter_Identity.h foundation_pEp_jniadapter_Identity.h
throw_pEp_exception.* throw_pEp_exception.*
src/java/foundation/pEp/jniadapter/exceptions/*.java src/java/foundation/pEp/jniadapter/exceptions/*.java
src/cxx/*.h
CipherSuite.java CipherSuite.java
Color.java Color.java

6
Makefile

@ -10,6 +10,9 @@ all: compile
compile: compile:
$(MAKE) -C src $(MAKE) -C src
generate:
$(MAKE) -C src codegen
test: compile test: compile
$(MAKE) -C test/java/foundation/pEp/jniadapter/test/ compile $(MAKE) -C test/java/foundation/pEp/jniadapter/test/ compile
@ -18,7 +21,8 @@ clean-all: clean clean-doc
clean: clean:
$(MAKE) -C src clean $(MAKE) -C src clean
$(MAKE) -C test/java/foundation/pEp/jniadapter/test/ clean clean-pep-home $(MAKE) -C test/java/foundation/pEp/jniadapter/test clean clean-pep-home
$(MAKE) -C test/java/foundation/pEp/pitytest clean
clean-doc: clean-doc:
rm -rf doc/doxygen/cxx rm -rf doc/doxygen/cxx

4
src/Makefile

@ -16,13 +16,17 @@ ifeq ($(PLATFORM),linux)
LIB_CXX_DYN_NAME=$(addsuffix .so,$(LIB_CXX_NAME)) LIB_CXX_DYN_NAME=$(addsuffix .so,$(LIB_CXX_NAME))
else ifeq ($(PLATFORM),darwin) else ifeq ($(PLATFORM),darwin)
LIB_CXX_DYN_NAME=$(addsuffix .dylib,$(LIB_CXX_NAME)) LIB_CXX_DYN_NAME=$(addsuffix .dylib,$(LIB_CXX_NAME))
else ifeq ($(PLATFORM),os/390)
LIB_CXX_DYN_NAME=
else else
$(error I dont know how to build for $(PLATFORM).) $(error I dont know how to build for $(PLATFORM).)
endif endif
LIB_JAVA=$(DIST_DIR)/$(LIB_JAVA_NAME) LIB_JAVA=$(DIST_DIR)/$(LIB_JAVA_NAME)
LIB_CXX_STATIC=$(DIST_DIR)/$(LIB_CXX_STATIC_NAME) LIB_CXX_STATIC=$(DIST_DIR)/$(LIB_CXX_STATIC_NAME)
ifdef LIB_CXX_DYN_NAME
LIB_CXX_DYN=$(DIST_DIR)/$(LIB_CXX_DYN_NAME) LIB_CXX_DYN=$(DIST_DIR)/$(LIB_CXX_DYN_NAME)
endif
$(info ------------------ DIST FILES ---------------------) $(info ------------------ DIST FILES ---------------------)
$(info LIB_JAVA: $(LIB_JAVA)) $(info LIB_JAVA: $(LIB_JAVA))

7
test/java/foundation/pEp/jniadapter/test/Makefile

@ -58,6 +58,11 @@ compile:
$(MAKE) -C jni150 compile $(MAKE) -C jni150 compile
clean: clean:
rm -f utils/model/*.class
rm -f utils/transport/fsmqmanager/*.class
rm -f utils/transport/fsmqmanager/test/ctx/*.class
rm -f utils/transport/fsmqmanager/test/utils/*.class
rm -f utils/transport/fsmsgqueue/*.class
$(MAKE) -C templateAlice clean $(MAKE) -C templateAlice clean
$(MAKE) -C templateAliceBob clean $(MAKE) -C templateAliceBob clean
$(MAKE) -C basic clean $(MAKE) -C basic clean
@ -72,6 +77,7 @@ clean:
$(MAKE) -C jni100 clean $(MAKE) -C jni100 clean
$(MAKE) -C jni111 clean $(MAKE) -C jni111 clean
$(MAKE) -C jni114 clean $(MAKE) -C jni114 clean
$(MAKE) -C jni115 clean
$(MAKE) -C jni118 clean $(MAKE) -C jni118 clean
$(MAKE) -C jni119 clean $(MAKE) -C jni119 clean
$(MAKE) -C jni125 clean $(MAKE) -C jni125 clean
@ -82,6 +88,7 @@ clean:
$(MAKE) -C jni143 clean $(MAKE) -C jni143 clean
$(MAKE) -C jni147 clean $(MAKE) -C jni147 clean
$(MAKE) -C jni148 clean $(MAKE) -C jni148 clean
$(MAKE) -C jni149 clean
$(MAKE) -C jni150 clean $(MAKE) -C jni150 clean
clean-pep-home: clean-pep-home:

1
test/java/foundation/pEp/pitytest/Makefile

@ -19,6 +19,7 @@ compile: $(JAVA_CLASSES)
clean: clean:
rm -f $(JAVA_CLASSES) rm -f $(JAVA_CLASSES)
rm -f *.class rm -f *.class
rm -f utils/*.class
rm -f *.log rm -f *.log
rm -Rf .gnupg rm -Rf .gnupg
rm -Rf .lldb rm -Rf .lldb
Loading…
Cancel
Save