Commit 1c70560c authored by garciay's avatar garciay
Browse files

Unify CAM/DENM codec code

parent d1b724a5

asn1/Makefile

+3 −5
Changes for asn1/Makefile: 3 added lines, 5 removed lines.
Original line number Original line Diff line number Diff line
@@ -61,12 +61,10 @@ $(BIN_DIR): 
	mkdir -p $@

	mkdir -p $@





$(BIN_DIR)/Makefile: $(BIN_DIR) Makefile

$(BIN_DIR)/Makefile: $(BIN_DIR) Makefile

	echo HOME=$(HOME)

	echo ASN_DIR=$(ASN_DIR) > $@

	echo ASN_DIR=$(ASN_DIR) > $@

ifneq (, $(findstring yann,$(HOME)))

ifneq (, $(findstring yann,$(HOME)))

	echo ASN1C_PATH = ~/frameworks/asn1c >> $@

	echo ASN1C_PATH = $(HOME)/frameworks/asn1c >> $@

endif 

ifneq (, $(findstring ubuntu,$(HOME)))

	echo ASN1C_PATH = ~/frameworks/asn1c >> $@

endif 

endif 

ifneq (, $(findstring filatov,$(HOME)))

ifneq (, $(findstring filatov,$(HOME)))

	echo ASN1C_PATH = C:/Users/filatov/Work/asn1c >> $@

	echo ASN1C_PATH = C:/Users/filatov/Work/asn1c >> $@
@@ -77,7 +75,7 @@ endif 
else

else

##########################################################

##########################################################

# This part is executed within the BIN_DIR directory to

# This part is executed within the BIN_DIR directory to

# override variables from the Makefile.am.example 

# override variables from the Makefile.am.$(PATTERN_ASN1C) 

# generated by asn1c

# generated by asn1c

LIB_MAKEFILE=Makefile.am.libasncodec

LIB_MAKEFILE=Makefile.am.libasncodec

include $(LIB_MAKEFILE)

include $(LIB_MAKEFILE)