Refactor some make variable names ENGINE-228
authorDamiano Boppart <damiano@pep-security.net>
Sun, 13 Aug 2017 02:39:07 +0200
branchENGINE-228
changeset 19558ec0b81a659f
parent 1954 23ca366b1a8a
child 1956 d1866ea945a1
Refactor some make variable names
Makefile
src/Makefile
sync/Makefile
test/Makefile
     1.1 --- a/Makefile	Sun Aug 13 02:33:06 2017 +0200
     1.2 +++ b/Makefile	Sun Aug 13 02:39:07 2017 +0200
     1.3 @@ -3,8 +3,7 @@
     1.4  
     1.5  include Makefile.conf
     1.6  
     1.7 -# add YML_PATH to the environment of all executed programs
     1.8 -export YML_PATH
     1.9 +export YML2_PATH
    1.10  
    1.11  HERE_REL := $(notdir $(CURDIR))
    1.12  
     2.1 --- a/src/Makefile	Sun Aug 13 02:33:06 2017 +0200
     2.2 +++ b/src/Makefile	Sun Aug 13 02:39:07 2017 +0200
     2.3 @@ -1,5 +1,7 @@
     2.4  include ../Makefile.conf
     2.5  
     2.6 +LD?=$(CC)
     2.7 +
     2.8  ETPAN_IN?=$(HOME)
     2.9  
    2.10  ifeq ($(BUILD_ON),Darwin)
    2.11 @@ -9,8 +11,7 @@
    2.12  MACOSX_VERSION_MIN=10.6
    2.13  LIBGPGME?=libgpgme.dylib
    2.14  CC?=clang -std=c99 -pthread
    2.15 -LD?=clang
    2.16 -CFLAGS?= -I$(ETPAN_IN)/include -I/opt/local/include $(OPTIMIZE) -pedantic \
    2.17 +CFLAGS?= -I$(ETPAN_IN)/include -I/opt/local/include -pedantic \
    2.18  	-DSYSTEM_DB=\"$(SYSTEM_DB)\" -I../asn.1 $(EXTRAMACROS)
    2.19  LDFLAGS?= -lc -shared -arch x86_64 \
    2.20  	-L$(ETPAN_IN)/lib -L/usr/lib -L/opt/local/lib -letpan -lsqlite3 -L../asn.1 -lasn1 -lz -liconv
    2.21 @@ -25,7 +26,7 @@
    2.22  TARGET=libpEpEngine.so
    2.23  LIBGPGME?=libgpgme.so.11
    2.24  CC=gcc -std=c99
    2.25 -CFLAGS?= -I$(ETPAN_IN)/include $(OPTIMIZE) -fPIC -pedantic -DSYSTEM_DB=\"$(SYSTEM_DB)\" \
    2.26 +CFLAGS?= -I$(ETPAN_IN)/include -fPIC -pedantic -DSYSTEM_DB=\"$(SYSTEM_DB)\" \
    2.27  	-DSQLITE_THREADSAFE=1 -D_GNU_SOURCE -I../asn.1 $(EXTRAMACROS)
    2.28  LDFLAGS?= -L$(ETPAN_IN)/lib -shared -lc -ldl -letpan -lpthread -L../asn.1 -lasn1 -luuid
    2.29  
     3.1 --- a/sync/Makefile	Sun Aug 13 02:33:06 2017 +0200
     3.2 +++ b/sync/Makefile	Sun Aug 13 02:39:07 2017 +0200
     3.3 @@ -14,10 +14,10 @@
     3.4  	touch $@
     3.5  
     3.6  .actions: devicegroup.fsm gen_actions.ysl2 fsm.yml2 functions.ysl2
     3.7 -	$(YML2PROC) $(YML_OPTS) -y gen_actions.ysl2 $< -o $@
     3.8 +	$(YML2_PROC) $(YML2_OPTS) -y gen_actions.ysl2 $< -o $@
     3.9  
    3.10  .statemachines: devicegroup.fsm gen_statemachine.ysl2 fsm.yml2 functions.ysl2
    3.11 -	$(YML2PROC) $(YML_OPTS) -y gen_statemachine.ysl2 $< -o $@
    3.12 +	$(YML2_PROC) $(YML2_OPTS) -y gen_statemachine.ysl2 $< -o $@
    3.13  
    3.14  .PHONY: clean
    3.15  clean:
    3.16 @@ -26,10 +26,10 @@
    3.17  	../generated/* ../skeletons/* .statemachines .actions .codegen
    3.18  
    3.19  %.xml: %.fsm
    3.20 -	$(YML_PATH)/yml2c $< -o $@
    3.21 +	$(YML2_PATH)/yml2c $< -o $@
    3.22  
    3.23  %.dot: gen_dot.ysl2 devicegroup.fsm
    3.24 -	$(YML2PROC) $(YML_OPTS) -y $^
    3.25 +	$(YML2_PROC) $(YML2_OPTS) -y $^
    3.26  
    3.27  %.svg: %.dot
    3.28  	dot -Tsvg -o $@ $<
     4.1 --- a/test/Makefile	Sun Aug 13 02:33:06 2017 +0200
     4.2 +++ b/test/Makefile	Sun Aug 13 02:39:07 2017 +0200
     4.3 @@ -3,12 +3,12 @@
     4.4  # see LICENSE.txt
     4.5  
     4.6  HERE := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
     4.7 +LD?=$(CXX)
     4.8  
     4.9  include ../Makefile.conf
    4.10  
    4.11  CC?=g++ -std=gnu++11 -pthread
    4.12  CXX?=g++ -std=gnu++11 -pthread
    4.13 -LD?=$(CXX)
    4.14  LDFLAGS?=-L$(HOME)/lib
    4.15  LDLIBS?=-letpan -lpEpEngine -lstdc++ -L../asn.1 -lasn1
    4.16  ifeq ($(BUILD_FOR),Linux)