Loading Makefile +5 −11 Original line number Diff line number Diff line Loading @@ -12,12 +12,6 @@ ifeq (,$(TTCN3_DIR)) $(error TTCN3_DIR shall be defined in config.mk) endif ifeq (Windows_NT,$(OS)) ifeq (,$(OPENSSL_DIR)) $(error OPENSSL_DIR shall be defined in config.mk) endif endif define IncludeModule undefine sources undefine modules Loading Loading @@ -52,7 +46,7 @@ outdir := $(TOPDIR)/build/$(ATS) bindir := $(TOPDIR)/bin sources := $(sort $(all_sources)) includes := $(outdir) $(outdir)/../asn1 $(all_includes) $(NPCAP_INCLUDE) includes := $(outdir) $(outdir)/.. $(outdir)/../asn1 $(all_includes) $(NPCAP_INCLUDE) EXE=.exe ttcn_sources := $(filter %.ttcn , $(sources)) Loading Loading @@ -94,7 +88,7 @@ echo: echo_sources @echo -e "defines: $(addsuffix \n, $(defines))" clean: rm -f $(outdir)/$(ATS)$(EXE) $(gen_objects) $(gen_sources) $(gen_headers) $(cc_objects) $(outdir)/$(ATS)/.generate $(outdir)/libItsAsn.so rm -f $(outdir)/$(ATS)$(EXE) $(gen_objects) $(gen_sources) $(gen_headers) $(cc_objects) $(outdir)/.generate $(outdir)/../libItsAsn.so # rm -f $(outdir)/asn1/*.so $(outdir)/asn1/*.o $(outdir)/asn1/*.c $(outdir)/asn1/*.h $(outdir)/asn1/Makefile.am.libasncodec regen: force_regen $(outdir)/.generate Loading @@ -105,7 +99,7 @@ $(outdir) $(bindir): mkdir -p $@ $(bindir)/$(ATS)$(EXE): $(outdir)/../asn1/libItsAsn.a $(gen_objects) $(cc_objects) g++ -g -O0 -o $@ $(LDFLAGS) $(gen_objects) $(cc_objects) $(outdir)/asn1/libItsAsn.a $(libs) g++ -g -O0 -o $@ $(LDFLAGS) $(gen_objects) $(cc_objects) $(outdir)/../asn1/libItsAsn.a $(libs) $(gen_objects) :%.o :%.cc g++ -g -O0 -c $(addprefix -D, $(defines)) $(addprefix -I, $(includes)) -o $@ $< Loading @@ -117,9 +111,9 @@ $(cc_objects) : $(outdir)/%.o : %.cc #$(gen_sources): # $(TTCN3_DIR)/bin/compiler -n -e -L -R -U none -o $(outdir) $(tt_sources) $(gen_sources): $(outdir)/.generate-$(ATS) $(gen_sources): $(outdir)/.generate $(outdir)/.generate-$(ATS): Makefile $(tt_sources) $(outdir)/.generate: Makefile $(tt_sources) $(TTCN3_DIR)/bin/compiler -n -e -L -R -U none -o $(outdir) $(tt_sources) touch $@ Loading config.mk +1 −1 File changed.Contains only whitespace changes. Show changes Loading
Makefile +5 −11 Original line number Diff line number Diff line Loading @@ -12,12 +12,6 @@ ifeq (,$(TTCN3_DIR)) $(error TTCN3_DIR shall be defined in config.mk) endif ifeq (Windows_NT,$(OS)) ifeq (,$(OPENSSL_DIR)) $(error OPENSSL_DIR shall be defined in config.mk) endif endif define IncludeModule undefine sources undefine modules Loading Loading @@ -52,7 +46,7 @@ outdir := $(TOPDIR)/build/$(ATS) bindir := $(TOPDIR)/bin sources := $(sort $(all_sources)) includes := $(outdir) $(outdir)/../asn1 $(all_includes) $(NPCAP_INCLUDE) includes := $(outdir) $(outdir)/.. $(outdir)/../asn1 $(all_includes) $(NPCAP_INCLUDE) EXE=.exe ttcn_sources := $(filter %.ttcn , $(sources)) Loading Loading @@ -94,7 +88,7 @@ echo: echo_sources @echo -e "defines: $(addsuffix \n, $(defines))" clean: rm -f $(outdir)/$(ATS)$(EXE) $(gen_objects) $(gen_sources) $(gen_headers) $(cc_objects) $(outdir)/$(ATS)/.generate $(outdir)/libItsAsn.so rm -f $(outdir)/$(ATS)$(EXE) $(gen_objects) $(gen_sources) $(gen_headers) $(cc_objects) $(outdir)/.generate $(outdir)/../libItsAsn.so # rm -f $(outdir)/asn1/*.so $(outdir)/asn1/*.o $(outdir)/asn1/*.c $(outdir)/asn1/*.h $(outdir)/asn1/Makefile.am.libasncodec regen: force_regen $(outdir)/.generate Loading @@ -105,7 +99,7 @@ $(outdir) $(bindir): mkdir -p $@ $(bindir)/$(ATS)$(EXE): $(outdir)/../asn1/libItsAsn.a $(gen_objects) $(cc_objects) g++ -g -O0 -o $@ $(LDFLAGS) $(gen_objects) $(cc_objects) $(outdir)/asn1/libItsAsn.a $(libs) g++ -g -O0 -o $@ $(LDFLAGS) $(gen_objects) $(cc_objects) $(outdir)/../asn1/libItsAsn.a $(libs) $(gen_objects) :%.o :%.cc g++ -g -O0 -c $(addprefix -D, $(defines)) $(addprefix -I, $(includes)) -o $@ $< Loading @@ -117,9 +111,9 @@ $(cc_objects) : $(outdir)/%.o : %.cc #$(gen_sources): # $(TTCN3_DIR)/bin/compiler -n -e -L -R -U none -o $(outdir) $(tt_sources) $(gen_sources): $(outdir)/.generate-$(ATS) $(gen_sources): $(outdir)/.generate $(outdir)/.generate-$(ATS): Makefile $(tt_sources) $(outdir)/.generate: Makefile $(tt_sources) $(TTCN3_DIR)/bin/compiler -n -e -L -R -U none -o $(outdir) $(tt_sources) touch $@ Loading