Start make cleanup make-cleanup
authorDamiano Boppart <damiano.boppart@pep.security>
Tue, 18 Dec 2018 13:45:38 +0100
branchmake-cleanup
changeset 319547da24127579
parent 3184 557a689068aa
child 3196 dea77b929e71
Start make cleanup
asn.1/Makefile
default.conf
src/Makefile
sync/Makefile
     1.1 --- a/asn.1/Makefile	Tue Dec 11 14:29:40 2018 +0100
     1.2 +++ b/asn.1/Makefile	Tue Dec 18 13:45:38 2018 +0100
     1.3 @@ -16,7 +16,7 @@
     1.4  	rm -f converter-sample.c
     1.5  
     1.6  %.o: %.c %.h
     1.7 -	$(CC) $(CFLAGS) $(OPTIMIZE) -I. -I$(ASN1C_INC) -c $< -o $@
     1.8 +	$(CC) $(CFLAGS) $(OPTIMIZE) -I. $(ASN1C_INC) -c $< -o $@
     1.9  
    1.10  Sync.c: sync.asn1 keysync.asn1 pEp.asn1
    1.11  	$(ASN1C) -gen-PER -fincludes-quoted -fcompound-names -pdu=auto pEp.asn1 keysync.asn1 $<
     2.1 --- a/default.conf	Tue Dec 11 14:29:40 2018 +0100
     2.2 +++ b/default.conf	Tue Dec 18 13:45:38 2018 +0100
     2.3 @@ -182,15 +182,18 @@
     2.4  ASN1C=asn1c
     2.5  
     2.6  # asn1c include search flag
     2.7 -ASN1C_INC=-I$(PREFIX)/include
     2.8 +ASN1C_INC=
     2.9 +#ASN1C_INC=-I$(PREFIX)/include
    2.10  
    2.11  
    2.12  ######### libetpan #########
    2.13  # libetpan library search flag
    2.14 -ETPAN_LIB=-L$(PREFIX)/lib
    2.15 +ETPAN_LIB=
    2.16 +#ETPAN_LIB=-L$(PREFIX)/lib
    2.17  
    2.18  # libetpan include search flag
    2.19 -ETPAN_INC=-I$(PREFIX)/include
    2.20 +ETPAN_INC=
    2.21 +#ETPAN_INC=-I$(PREFIX)/include
    2.22  
    2.23  
    2.24  ######### sqlite3 #########
    2.25 @@ -215,18 +218,12 @@
    2.26  endif
    2.27  
    2.28  # libGPGME library search flag
    2.29 -ifeq ($(BUILD_FOR),Linux)
    2.30 -    GPGME_LIB=
    2.31 -else ifeq ($(BUILD_FOR),Darwin)
    2.32 -    GPGME_LIB=-L$(HOME)/lib
    2.33 -endif
    2.34 +GPGME_LIB=
    2.35 +#GPGME_LIB=-L$(HOME)/lib
    2.36  
    2.37  # libGPGME include search flag
    2.38 -ifeq ($(BUILD_FOR),Linux)
    2.39 -    GPGME_INC=
    2.40 -else ifeq ($(BUILD_FOR),Darwin)
    2.41 -    GPGME_INC=-I$(HOME)/include
    2.42 -endif
    2.43 +GPGME_INC=
    2.44 +#GPGME_INC=-I$(HOME)/include
    2.45  
    2.46  # NETPGP library search flag
    2.47  NETPGP_LIB=
     3.1 --- a/src/Makefile	Tue Dec 11 14:29:40 2018 +0100
     3.2 +++ b/src/Makefile	Tue Dec 18 13:45:38 2018 +0100
     3.3 @@ -81,6 +81,7 @@
     3.4  clean:
     3.5  	rm -f *.d *.o *.a $(TARGET) *.dll *.so *.zip *.d.* *.def *~
     3.6  	rm -Rf $(TARGET).dSYM
     3.7 +	rm -f KeySync_fsm.* Sync_actions.c Sync_event.* Sync_func.* Sync_impl.* sync_codec.*
     3.8  
     3.9  .PHONY: install
    3.10  install: $(TARGET)
     4.1 --- a/sync/Makefile	Tue Dec 11 14:29:40 2018 +0100
     4.2 +++ b/sync/Makefile	Tue Dec 18 13:45:38 2018 +0100
     4.3 @@ -25,7 +25,7 @@
     4.4  .PHONY: clean copy
     4.5  
     4.6  clean:
     4.7 -	rm -f *.xml *.xsl generated/* .statemachines .actions .codecs .messages *.dot *.svg
     4.8 +	rm -f *.xml *.xsl generated/* .statemachines .actions .codecs .messages .codegen *.dot *.svg
     4.9  
    4.10  copy:
    4.11  	cp -f generated/*.c generated/*.h ../src