use cshared submodule. use common.mk from cshared. (a98d0455) · Commits · ITS - Intelligent Transport Systems / ItsCertGen

.gitmodules

0 → 100644

+3 −0

Original line number	Diff line number	Diff line
		[submodule "cshared"]
		path = cshared
		url = https://github.com/fillabs/cshared.git

build/common.mk

deleted100644 → 0

+0 −234

Original line number	Diff line number	Diff line
		export LANG=en_US
		ALL_CONFIGURATIONS := POSIX WIN32
		.PHONY: all clean tests docs cleandocs distr DUMMY

		BUILDROOT ?= $(PROJECTROOT)/build
		CSHAREDDIR ?= $(PROJECTROOT)/cshared
		CXMLDIR ?= $(PROJECTROOT)/cxml

		ifeq ($(ARCH),)
		ARCH = $(shell gcc -dumpmachine)
		GCC := gcc
		STRIP := strip
		AR := ar
		else
		GCC := $(addprefix $(addsuffix -,$(ARCH)), gcc)
		STRIP := $(addprefix $(addsuffix -,$(ARCH)), strip)
		AR := $(addprefix $(addsuffix -,$(ARCH)), ar)
		endif

		-include $(BUILDROOT)/$(ARCH).mk

		ifneq ($(findstring w32,$(ARCH)),)
		packages := $(filter-out readline threads, $(packages))
		CFG += WIN32
		else
		CFG += POSIX
		endif

		ifneq ($(findstring cygwin,$(ARCH)),)
		CFG += CYGWIN
		endif

		ifneq ($(findstring openwrt,$(ARCH)),)
		CFG += OPENWRT
		endif

		cflags += -fPIC -Wall

		ifeq ($(DEBUG),)
		DEBUG=no
		endif

		ifeq ($(DEBUG),yes)
		cflags += -g -O0
		defines += DEBUG
		dsuffix = -d
		else
		defines += NDEBUG
		cflags += -O2
		endif

		ifneq ($(filter readline, $(packages)),)
		defines += USE_READLINE
		libs += -lreadline
		endif

		ifneq ($(filter dmalloc, $(packages)),)
		defines += DMALLOC DMALLOC_FUNC_CHECK
		libs += -ldmalloc
		dsuffix = -dmalloc
		endif

		ifneq ($(filter profile, $(packages)),)
		cflags += -pg
		endif

		ifneq ($(filter openssl, $(packages)),)
		ifneq ($(findstring mingw32,$(ARCH)),)
		ifeq ($(OPENSSL_DIR),)
		OPENSSL_DIR := C:/OpenSSL/Win32
		endif
		libs += $(OPENSSL_DIR)/lib/MinGW/libcrypto.a $(OPENSSL_DIR)/lib/MinGW/libssl.a
		else
		libs += -lssl -lcrypto
		endif
		ifneq ($(OPENSSL_DIR),)
		includes += $(OPENSSL_DIR)/include
		libs += -L $(OPENSSL_DIR)/lib
		endif
		endif

		ifneq ($(filter cxml, $(packages)),)
		predirs += $(CXMLDIR)
		includes += $(CXMLDIR)
		endif

		ifneq ($(filter cshared, $(packages)),)
		predirs += $(CSHAREDDIR)
		includes += $(CSHAREDDIR)
		endif

		ifneq ($(filter pcap, $(packages)),)
		ifneq ($(findstring cygwin,$(ARCH)),)
		ifneq ($(NPCAP_SDK),)
		includes += "$(NPCAP_SDK)/Include"
		libs += "/cygdrive/c/Windows/System32/Npcap/wpcap.dll"
		endif
		else
		libs += -lpcap
		endif
		endif

		ifneq ($(filter thread, $(packages)),)
		defines += USE_THREADS
		libs += -lpthread
		endif


		ifeq ($(testdir), )
		testdir := tests
		endif

		includes += $(foreach cfg,$(CFG),$(includes-$(cfg)))
		defines += $(foreach cfg,$(CFG),$(defines-$(cfg)))
		libs += $(foreach cfg,$(CFG),$(libs-$(cfg)))
		sources += $(foreach cfg,$(CFG),$(sources-$(cfg)))
		headers += $(foreach cfg,$(CFG),$(headers-$(cfg)))
		tests += $(foreach cfg,$(CFG),$(tests-$(cfg)))
		distfiles += $(foreach cfg,$(CFG),$(distfiles-$(cfg)))
		predirs += $(foreach cfg,$(CFG),$(predirs-$(cfg)))
		postdirs += $(foreach cfg,$(CFG),$(postdirs-$(cfg)))

		tests := $(addprefix $(addsuffix /,$(testdir)),$(tests))
		sources := $(addprefix $(addsuffix /,$(srcdir)),$(sources))
		headers := $(addprefix $(addsuffix /,$(incdir)),$(headers))

		cflags += $(addprefix -I, $(includes)) $(addprefix -D, $(defines))

		ifeq ($(BUILDROOT),)
		BUILDROOT = .
		endif

		outdir := $(BUILDROOT)/$(ARCH)$(dsuffix)
		objdir := $(outdir)/o-$(PROJECT)
		objects := $(patsubst %.c, $(objdir)/%.o, $(sources))
		$(foreach b,$(bins),$(eval objects-$(b)=$$(patsubst %.c,$$(objdir)/%.o,$$(sources-$(b)))))
		$(info objects-certgen=$(objects-certgen))
		$(info objects-keygen=$(objects-keygen))

		binobjects:= $(patsubst %.c, $(objdir)/%.o, $(foreach b,$(bins),$(sources-$(b))))
		testbins := $(patsubst %.c, $(outdir)/%, $(tests))
		dirs := $(objdir) $(outdir)/tests

		alibnames := $(patsubst %, $(outdir)/lib%.a, $(alibs))
		solibnames := $(patsubst %, $(outdir)/lib%.so, $(solibs))
		binnames := $(patsubst %, $(outdir)/%, $(bins))

		ldflags += $(patsubst %, -L%, $(outdir) $(libdirs))

		ifneq ($(filter cxml, $(packages)),)
		deplibs += $(outdir)/libcxml.a
		endif

		ifneq ($(filter cshared, $(packages)),)
		deplibs += $(outdir)/libcshared.a
		endif


		all: $(dirs) $(pre) $(predirs) $(alibnames) $(solibnames) $(binnames) $(postdirs) $(post)

		tests: all $(testbins)

		$(predirs) $(postdirs): DUMMY
		$(MAKE) -C $@ ARCH=$(ARCH) PROJECTROOT=$(realpath $(PROJECTROOT)) BUILDROOT=$(realpath $(BUILDROOT)) DEBUG=$(DEBUG)

		define ALibRule
		$$(outdir)/lib$(l).a: $$(outdir)/lib%.a : $$(objects-$(l)) $$(objects)
		$$(AR) rcs $$@ $$^
		endef
		$(foreach l, $(alibs), $(eval $(ALibRule)))

		define SoLibRule
		$$(outdir)/lib$(l).so: $$(outdir)/lib%.so : $$(objects-$(l)) $$(objects) $$(deplibs)
		$$(GCC) $$(cflags) -shared $$(ldflags) -o $$@ $$^ $$(csharedlib) $$(deplibs) $$(libs) $$(libs_$$*)
		ifeq (no,$$(DEBUG))
		$$(STRIP) $@
		endif
		endef
		$(foreach l, $(solibs), $(eval $(SoLibRule)))

		define BinRule
		$$(outdir)/$(b): $$(outdir)/%: $$(objects-$(b)) $$(objects) $$(deplibs)
		$$(GCC) $$(cflags) $$(ldflags) -o $$@ $$^ $$(csharedlib) $$(deplibs) $$(libs) $$(libs_$$*)
		ifeq (no,$$(DEBUG))
		$$(STRIP) $$@
		endif
		endef
		$(foreach b, $(bins), $(eval $(BinRule)))

		#$(eval $(call BinRule, certgen))

		#$(eval $(call BinRule, keygen))

		#$(binnames): $(outdir)/% : $(eval $$(objects-%)) $(objects) $(deplibs)
		# $(GCC) $(cflags) $(ldflags) -o $@ $^ $(csharedlib) $(deplibs) $(libs) $(libs_$*)
		#ifeq (no,$(DEBUG))
		# $(STRIP) $@
		#endif

		$(testbins): $(alibnames)
		$(testbins): $(outdir)/tests/% : tests/%.c
		$(GCC) $(cflags) $(cflags_$) -o $@ $< $(alibnames) $(libs) $(libs_$)
		ifeq (no,$(DEBUG))
		$(STRIP) $@
		endif

		$(dirs):
		mkdir -p $@

		$(objects) $(binobjects): $(objdir)/%.o: %.c
		@mkdir -p $(dir $@)
		$(GCC) $(cflags) -o $@ -MMD -MF $(objdir)/$*.d -c $(abspath $<)

		clean:
		rm -rf $(alibnames) $(solibnames) $(binnames) $(testbins) $(objects)

		distfiles += $(wildcard Makefile $(DOXYFILE))
		dist:
		-rm -rf $(PROJECT) $(PROJECT)-$(shell date -u '+%Y%m%d').tar.gz
		mkdir $(PROJECT)
		cp --parents $(sources) $(headers) $(distfiles) $(addprefix tests/, $(tests)) $(PROJECT)
		tar -zcvf $(PROJECT)-$(shell date -u '+%Y%m%d').tar.gz $(PROJECT)
		rm -rf $(PROJECT)
		# tar -zcvf $(PROJECT)-$(shell date -u '+%Y%m%d').tar.gz $(sources) $(headers) $(distfiles) $(addprefix tests/, $(tests))

		ifneq (,$(DOXYFILE))
		docs: $(DOXYFILE)
		doxygen $(DOXYFILE)

		cleandocs:
		rm -rf doc/html
		endif

		include $(wildcard $(addsuffix /*.d, $(objdir)))

certgen/Makefile

+4 −3

Original line number	Diff line number	Diff line
		@@ -3,10 +3,11 @@
		## Created by: Denis Filatov
		##
		## Copyleft (c) 2015
		## This code is provided under the CeCill-C license agreement.
		## This code is provided under the MIT license agreement.
		######################################################################
		PROJECTROOT = ..
		BUILDROOT = $(PROJECTROOT)/build
		#BUILDROOT = $(PROJECTROOT)/build
		CSHAREDDIR = $(PROJECTROOT)/cshared
		PROJECT = certgen
		DEBUG = yes
		bins = certgen keygen
		@@ -20,4 +21,4 @@ packages += cshared openssl
		predirs := asncodec
		includes += asncodec
		libs += $(outdir)/libItsCertAsn.a
		include $(BUILDROOT)/common.mk
		include $(CSHAREDDIR)/common.mk

certgen/asncodec/Makefile

+3 −2

Original line number	Diff line number	Diff line
		@@ -3,13 +3,14 @@
		## Created by: Denis Filatov
		##
		## Copyleft (c) 2015
		## This code is provided under the CeCill-C license agreement.
		## This code is provided under the MIT license agreement.
		######################################################################
		PROJECTROOT = ../..
		BUILDROOT = $(PROJECTROOT)/build
		CSHAREDDIR = $(PROJECTROOT)/cshared
		PROJECT = ItsCertAsn
		DEBUG = yes
		alibs = ItsCertAsn
		sources := $(wildcard *.c)
		includes += .
		include $(BUILDROOT)/common.mk
		include $(CSHAREDDIR)/common.mk

cshared @ a4f1cc6b

Original line number	Diff line number	Diff line
		Subproject commit a4f1cc6b7f364c42c29e06190256534a6a11fbba

Admin message