merging sync
authorVolker Birk <vb@pep-project.org>
Fri, 03 May 2019 10:47:43 +0200
branchsync
changeset 361195a05d4cf872
parent 3610 97033a138011
parent 3608 dbcb24324e86
child 3612 2084f4779e1b
child 3613 f330f7da89c5
merging
     1.1 --- a/Makefile	Fri May 03 10:47:30 2019 +0200
     1.2 +++ b/Makefile	Fri May 03 10:47:43 2019 +0200
     1.3 @@ -19,6 +19,13 @@
     1.4      $(info ================================================)
     1.5  endif
     1.6  
     1.7 +ifneq ($(MAKE_VERSION),$(word 2,$(sort $(MAKE_VERSION) 4)))
     1.8 +    $(warning ================================================)
     1.9 +    $(warning You are using a make version older than 4. This might cause problems.)
    1.10 +    $(warning ================================================)
    1.11 +endif
    1.12 +
    1.13 +
    1.14  .PHONY: all sync asn1 build install dbinstall uninstall clean tags test package db
    1.15  
    1.16  build: asn1
     2.1 --- a/asn.1/Makefile	Fri May 03 10:47:30 2019 +0200
     2.2 +++ b/asn.1/Makefile	Fri May 03 10:47:43 2019 +0200
     2.3 @@ -21,9 +21,6 @@
     2.4  	$(ASN1C) -gen-PER -fincludes-quoted -fcompound-names -pdu=auto pEp.asn1 keysync.asn1 $<
     2.5  	rm -f converter-sample.c
     2.6  
     2.7 -sync.asn1 keysync.asn1 pEp.asn1:
     2.8 -	cp -f ../sync/generated/*.asn1 ../asn.1
     2.9 -
    2.10  clean:
    2.11  	rm -f *.a *.o *.c *.h *.sample sync.asn1 keysync.asn1
    2.12  
     3.1 --- a/sync/Makefile	Fri May 03 10:47:30 2019 +0200
     3.2 +++ b/sync/Makefile	Fri May 03 10:47:43 2019 +0200
     3.3 @@ -29,6 +29,7 @@
     3.4  
     3.5  .copy: .actions .statemachines .codecs .messages
     3.6  	cp -f generated/*.c generated/*.h ../src
     3.7 +	cp -f generated/*.asn1 ../asn.1
     3.8  	touch .copy
     3.9  
    3.10  %.xml: %.fsm