Minor makefile fixes make-cleanup
authorDamiano Boppart <damiano.boppart@pep.security>
Sat, 22 Dec 2018 01:34:30 +0100
branchmake-cleanup
changeset 3204fa2e7ead0f4e
parent 3203 47bb3a01f2e1
child 3205 eb1093486582
Minor makefile fixes
src/Makefile
sync/Makefile
test/Makefile
     1.1 --- a/src/Makefile	Sat Dec 22 00:35:43 2018 +0100
     1.2 +++ b/src/Makefile	Sat Dec 22 01:34:30 2018 +0100
     1.3 @@ -88,11 +88,11 @@
     1.4  	mkdir -p "$(PREFIX)/lib/"
     1.5  	cp $< $(PREFIX)/lib/
     1.6  	mkdir -p $(PREFIX)/include/pEp
     1.7 -	cp -v pEpEngine.h keymanagement.h message_api.h dynamic_api.h stringlist.h \
     1.8 -	      timestamp.h identity_list.h bloblist.h stringpair.h message.h mime.h \
     1.9 -	      cryptotech.h sync_api.h blacklist.h pEp_string.h openpgp_compat.h \
    1.10 -	      labeled_int_list.h key_reset.h base64.h sync_codec.h \
    1.11 -	      ../asn.1/*.h $(PREFIX)/include/pEp/
    1.12 +	cp pEpEngine.h keymanagement.h message_api.h dynamic_api.h stringlist.h \
    1.13 +	   timestamp.h identity_list.h bloblist.h stringpair.h message.h mime.h \
    1.14 +	   cryptotech.h sync_api.h blacklist.h pEp_string.h openpgp_compat.h \
    1.15 +	   labeled_int_list.h key_reset.h base64.h sync_codec.h \
    1.16 +	   ../asn.1/*.h $(PREFIX)/include/pEp/
    1.17  
    1.18  .PHONY: uninstall
    1.19  uninstall:
     2.1 --- a/sync/Makefile	Sat Dec 22 00:35:43 2018 +0100
     2.2 +++ b/sync/Makefile	Sat Dec 22 01:34:30 2018 +0100
     2.3 @@ -5,9 +5,10 @@
     2.4  
     2.5  all: .codegen
     2.6  
     2.7 -.codegen: generated .statemachines .actions .codecs .messages
     2.8 +.codegen: .statemachines .actions .codecs .messages
     2.9 +	-mkdir -p generated
    2.10  	touch .codegen
    2.11 -	make copy
    2.12 +	$(MAKE) copy
    2.13  
    2.14  .actions: sync.fsm gen_actions.ysl2 fsm.yml2 functions.ysl2 $(wildcard cond_act_*.yml2)
    2.15  	$(YML2_PROC) -y gen_actions.ysl2 $< -o $@
    2.16 @@ -30,9 +31,6 @@
    2.17  copy:
    2.18  	cp -f generated/*.c generated/*.h ../src
    2.19  
    2.20 -generated: .codegen
    2.21 -	-mkdir -p generated
    2.22 -
    2.23  %.xml: %.fsm
    2.24  	yml2c $< -o $@
    2.25  
     3.1 --- a/test/Makefile	Sat Dec 22 00:35:43 2018 +0100
     3.2 +++ b/test/Makefile	Sat Dec 22 01:34:30 2018 +0100
     3.3 @@ -7,6 +7,8 @@
     3.4  
     3.5  include ../Makefile.conf
     3.6  
     3.7 +VPATH=src
     3.8 +
     3.9  # User's without python3 will skip the generated parts of the test suite. That's OK.
    3.10  PY_ENV:=$(shell command -v python3 2> /dev/null)
    3.11  
    3.12 @@ -95,7 +97,7 @@
    3.13  
    3.14  .PHONY: clean
    3.15  clean:
    3.16 -	$(RM) $(TARGET) $(OBJS) $(DEPS)
    3.17 +	$(RM) $(TARGET) $(TARGET).o $(OBJS) $(notdir $(basename $(OBJS))) $(DEPS)
    3.18  	$(RM) $(HERE)/*Tests msg_2.0.asc
    3.19  
    3.20  # If only the goal 'clean' is given, do not generate and include the '%.d' files.¬