From dfdac48418b57fd5e3393d5a53dd3d9fbd16822e Mon Sep 17 00:00:00 2001 From: Maksym Telychko Date: Thu, 6 Jun 2019 16:16:16 +0300 Subject: [MTS-MTQ] refactoring: Makefile --- Makefile | 140 +++++++++++++++++++++++++-------------------------------------- 1 file changed, 55 insertions(+), 85 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 677c34d..bfe5b12 100644 --- a/Makefile +++ b/Makefile @@ -1,104 +1,74 @@ include version -includedir ?= /usr/include +APPNAME = libmts-io libdir ?= /usr/lib OBJS += \ -MTS_IO_CdmaRadio.o \ -MTS_IO_CE910Radio.o \ -MTS_IO_CellularRadio.o \ -MTS_IO_CellularRadioFactory.o \ -MTS_IO_Connection.o \ -MTS_IO_DE910Radio.o \ -MTS_IO_GE910Radio.o \ -MTS_IO_HE910Radio.o \ -MTS_IO_HE910DRadio.o \ -MTS_IO_HE910EUDRadio.o \ -MTS_IO_LE910JN1Radio.o \ -MTS_IO_LE866Radio.o \ -MTS_IO_LE866A1JSRadio.o \ -MTS_IO_LE910Radio.o \ -MTS_IO_LE910NAGRadio.o \ -MTS_IO_LE910C4NFRadio.o \ -MTS_IO_LE910NA1Radio.o \ -MTS_IO_LE910SVGRadio.o \ -MTS_IO_LE910EUGRadio.o \ -MTS_IO_LE910C4EURadio.o \ -MTS_IO_LE910EU1Radio.o \ -MTS_IO_LE910C1NSRadio.o \ -MTS_IO_LE910C1APRadio.o \ -MTS_IO_ME910C1NARadio.o \ -MTS_IO_ME910C1NVRadio.o \ -MTS_IO_ME910C1WWRadio.o \ -MTS_IO_ME910Radio.o \ -MTS_IO_LockFile.o \ -MTS_IO_MccMncTable.o \ -MTS_IO_SerialConnection.o + src/MTS_IO_TelitRadio.o \ + src/MTS_IO_EG95Radio.o \ + src/MTS_IO_QuectelRadio.o \ + src/MTS_IO_CdmaRadio.o \ + src/MTS_IO_CE910Radio.o \ + src/MTS_IO_CellularRadio.o \ + src/MTS_IO_CellularRadioFactory.o \ + src/MTS_IO_Connection.o \ + src/MTS_IO_DE910Radio.o \ + src/MTS_IO_GE910Radio.o \ + src/MTS_IO_HE910Radio.o \ + src/MTS_IO_HE910DRadio.o \ + src/MTS_IO_HE910EUDRadio.o \ + src/MTS_IO_LE910JN1Radio.o \ + src/MTS_IO_LE866Radio.o \ + src/MTS_IO_LE866A1JSRadio.o \ + src/MTS_IO_LE910Radio.o \ + src/MTS_IO_LE910NAGRadio.o \ + src/MTS_IO_LE910C4NFRadio.o \ + src/MTS_IO_LE910NA1Radio.o \ + src/MTS_IO_LE910SVGRadio.o \ + src/MTS_IO_LE910EUGRadio.o \ + src/MTS_IO_LE910C4EURadio.o \ + src/MTS_IO_LE910EU1Radio.o \ + src/MTS_IO_LE910C1NSRadio.o \ + src/MTS_IO_LE910C1APRadio.o \ + src/MTS_IO_ME910C1NARadio.o \ + src/MTS_IO_ME910C1NVRadio.o \ + src/MTS_IO_ME910C1WWRadio.o \ + src/MTS_IO_ME910Radio.o \ + src/MTS_IO_LockFile.o \ + src/MTS_IO_MccMncTable.o \ + src/MTS_IO_SerialConnection.o -CPP_DEPS += \ -MTS_IO_CdmaRadio.d \ -MTS_IO_CE910Radio.d \ -MTS_IO_CellularRadio.d \ -MTS_IO_CellularRadioFactory.d \ -MTS_IO_Connection.d \ -MTS_IO_DE910Radio.d \ -MTS_IO_GE910Radio.d \ -MTS_IO_HE910Radio.d \ -MTS_IO_HE910DRadio.d \ -MTS_IO_HE910EUDRadio.d \ -MTS_IO_LE910JN1Radio.d \ -MTS_IO_LE866Radio.d \ -MTS_IO_LE866A1JSRadio.d \ -MTS_IO_LE910Radio.d \ -MTS_IO_LE910NAGRadio.d \ -MTS_IO_LE910C4NFRadio.d \ -MTS_IO_LE910NA1Radio.d \ -MTS_IO_LE910SVGRadio.d \ -MTS_IO_LE910EUGRadio.d \ -MTS_IO_LE910C4EURadio.d \ -MTS_IO_LE910EU1Radio.d \ -MTS_IO_LE910C1NSRadio.d \ -MTS_IO_LE910C1APRadio.d \ -MTS_IO_ME910C1NARadio.d \ -MTS_IO_ME910C1NVRadio.d \ -MTS_IO_ME910C1WWRadio.d \ -MTS_IO_ME910Radio.d \ -MTS_IO_LockFile.d \ -MTS_IO_MccMncTable.d \ -MTS_IO_SerialConnection.d +CC := $(CXX) +#-Werror +CXXFLAGS += -Wall -std=c++0x -fmessage-length=0 -fPIC +CPPFLAGS += -I=/usr/include/jsoncpp -Iinclude +LDFLAGS += -s -shared -Wl,-soname,$(APPNAME).so.0 -all: libmts-io.a libmts-io.so.0 +.PHONY: all clean install -libmts-io.a: $(OBJS) - @echo 'Building target: $@' - $(AR) -r libmts-io.a $(OBJS) - @echo 'Finished building target: $@' - @echo ' ' +all: $(APPNAME).a $(APPNAME).so.$(VERSION) -libmts-io.so.0: $(OBJS) - @echo 'Building target: $@' - $(CXX) $(LDFLAGS) -shared -Wl,-soname,$@ -o libmts-io.so.$(VERSION) $(OBJS) - @echo 'Finished building target: $@' - @echo ' ' -%.o: src/%.cpp - @echo 'Building file: $<' - $(CXX) $(CFLAGS) -I=$(includedir)/jsoncpp -Iinclude -Wall -Werror -c -fPIC -fmessage-length=0 -std=c++0x -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" - @echo 'Finished building: $<' - @echo ' ' +$(APPNAME).a: $(OBJS) + $(AR) -r $@ $? + +$(APPNAME).so.$(VERSION): $(OBJS) + $(CC) $(LDFLAGS) -o $@ $? $(LDLIBS) + +# Handle header dependencies +DEPS = $(OBJS:.o=.d) +CPPFLAGS += -MMD +-include $(DEPS) install: mkdir -p $(DESTDIR)$(libdir) mkdir -p $(DESTDIR)$(includedir)/mts - install -m 0644 libmts-io.a libmts-io.so.$(VERSION) $(DESTDIR)$(libdir)/ - ln -sf libmts-io.so.$(VERSION) $(DESTDIR)$(libdir)/libmts-io.so.0 - ln -sf libmts-io.so.0 $(DESTDIR)$(libdir)/libmts-io.so + install -m 0644 $(APPNAME).a $(APPNAME).so.$(VERSION) $(DESTDIR)$(libdir)/ + ln -sf $(APPNAME).so.$(VERSION) $(DESTDIR)$(libdir)/$(APPNAME).so.0 + ln -sf $(APPNAME).so.0 $(DESTDIR)$(libdir)/$(APPNAME).so install -m 0644 include/mts/* $(DESTDIR)$(includedir)/mts/ clean: - -$(RM) $(OBJS) $(CPP_DEPS) libmts-io.a libmts-io.so* - -@echo ' ' + $(RM) $(OBJS) $(APPNAME).a $(APPNAME).so.$(VERSION) $(DEPS) -.PHONY: all clean dependents install -.SECONDARY: -- cgit v1.2.3 From 417049f51180b3b4be84fbc0d86a3c690972fb3b Mon Sep 17 00:00:00 2001 From: Maksym Telychko Date: Thu, 6 Jun 2019 18:06:43 +0300 Subject: [MTS-MTQ] refactoring: moved common consts and static methods to ICellularRadio --- Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index bfe5b12..6c09bff 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,7 @@ OBJS += \ src/MTS_IO_CdmaRadio.o \ src/MTS_IO_CE910Radio.o \ src/MTS_IO_CellularRadio.o \ + src/MTS_IO_ICellularRadio.o \ src/MTS_IO_CellularRadioFactory.o \ src/MTS_IO_Connection.o \ src/MTS_IO_DE910Radio.o \ -- cgit v1.2.3 From 936d8d57853e1ffbe1f46874b7ba9194e26cccb9 Mon Sep 17 00:00:00 2001 From: Maksym Telychko Date: Fri, 7 Jun 2019 12:35:49 +0300 Subject: [MTS-MTQ] refactoring makefile: so name fix for dynamic linking --- Makefile | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 6c09bff..ddc7a7a 100644 --- a/Makefile +++ b/Makefile @@ -47,13 +47,12 @@ LDFLAGS += -s -shared -Wl,-soname,$(APPNAME).so.0 .PHONY: all clean install -all: $(APPNAME).a $(APPNAME).so.$(VERSION) - +all: $(APPNAME).a $(APPNAME).so $(APPNAME).a: $(OBJS) $(AR) -r $@ $? -$(APPNAME).so.$(VERSION): $(OBJS) +$(APPNAME).so: $(OBJS) $(CC) $(LDFLAGS) -o $@ $? $(LDLIBS) # Handle header dependencies @@ -64,12 +63,10 @@ CPPFLAGS += -MMD install: mkdir -p $(DESTDIR)$(libdir) mkdir -p $(DESTDIR)$(includedir)/mts - install -m 0644 $(APPNAME).a $(APPNAME).so.$(VERSION) $(DESTDIR)$(libdir)/ - ln -sf $(APPNAME).so.$(VERSION) $(DESTDIR)$(libdir)/$(APPNAME).so.0 + install -m 0644 $(APPNAME).a $(APPNAME).so $(DESTDIR)$(libdir)/ + ln -sf $(APPNAME).so $(DESTDIR)$(libdir)/$(APPNAME).so.0 ln -sf $(APPNAME).so.0 $(DESTDIR)$(libdir)/$(APPNAME).so install -m 0644 include/mts/* $(DESTDIR)$(includedir)/mts/ clean: - $(RM) $(OBJS) $(APPNAME).a $(APPNAME).so.$(VERSION) $(DEPS) - - + $(RM) $(OBJS) $(APPNAME).a $(APPNAME).so $(DEPS) -- cgit v1.2.3 From 55c18e47596b6be9f19b33deb6c5cd0e798decd8 Mon Sep 17 00:00:00 2001 From: Maksym Telychko Date: Fri, 7 Jun 2019 12:38:11 +0300 Subject: [MTS-MTQ] refactoring: public symbols visibility Make exported ICellularRadio and CellularRadioFactory only --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index ddc7a7a..2fdaf04 100644 --- a/Makefile +++ b/Makefile @@ -41,7 +41,7 @@ OBJS += \ CC := $(CXX) #-Werror -CXXFLAGS += -Wall -std=c++0x -fmessage-length=0 -fPIC +CXXFLAGS += -Wall -std=c++0x -fmessage-length=0 -fPIC -fvisibility=hidden -fvisibility-inlines-hidden CPPFLAGS += -I=/usr/include/jsoncpp -Iinclude LDFLAGS += -s -shared -Wl,-soname,$(APPNAME).so.0 -- cgit v1.2.3 From 00f886a2eb636a9e44eca0ab47d4125db3e9300a Mon Sep 17 00:00:00 2001 From: Maksym Telychko Date: Mon, 10 Jun 2019 15:02:59 +0300 Subject: [MTS-MTQ] refactoring: soname links --- Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 2fdaf04..e49f5cc 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ include version APPNAME = libmts-io +SONAME = $(APPNAME).so.$(VERSION) libdir ?= /usr/lib OBJS += \ @@ -47,12 +48,12 @@ LDFLAGS += -s -shared -Wl,-soname,$(APPNAME).so.0 .PHONY: all clean install -all: $(APPNAME).a $(APPNAME).so +all: $(APPNAME).a $(SONAME) $(APPNAME).a: $(OBJS) $(AR) -r $@ $? -$(APPNAME).so: $(OBJS) +$(SONAME): $(OBJS) $(CC) $(LDFLAGS) -o $@ $? $(LDLIBS) # Handle header dependencies @@ -63,9 +64,9 @@ CPPFLAGS += -MMD install: mkdir -p $(DESTDIR)$(libdir) mkdir -p $(DESTDIR)$(includedir)/mts - install -m 0644 $(APPNAME).a $(APPNAME).so $(DESTDIR)$(libdir)/ - ln -sf $(APPNAME).so $(DESTDIR)$(libdir)/$(APPNAME).so.0 - ln -sf $(APPNAME).so.0 $(DESTDIR)$(libdir)/$(APPNAME).so + install -m 0644 $(APPNAME).a $(SONAME) $(DESTDIR)$(libdir)/ + ln -sf $(SONAME) $(DESTDIR)$(libdir)/$(APPNAME).so.0 + ln -sf $(SONAME) $(DESTDIR)$(libdir)/$(APPNAME).so install -m 0644 include/mts/* $(DESTDIR)$(includedir)/mts/ clean: -- cgit v1.2.3 From 6848f0470159df2318c2377a08766a3bb9dcb4c3 Mon Sep 17 00:00:00 2001 From: Maksym Telychko Date: Tue, 11 Jun 2019 11:28:39 +0300 Subject: [MTS-MTQ] refactoring: makefile clean target fix --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index e49f5cc..3ace73f 100644 --- a/Makefile +++ b/Makefile @@ -70,4 +70,4 @@ install: install -m 0644 include/mts/* $(DESTDIR)$(includedir)/mts/ clean: - $(RM) $(OBJS) $(APPNAME).a $(APPNAME).so $(DEPS) + $(RM) $(OBJS) $(APPNAME).a $(SONAME) $(DEPS) -- cgit v1.2.3 From 3b542d1fea82726842e6bfe03ddcbf86345c5b9d Mon Sep 17 00:00:00 2001 From: Maksym Telychko Date: Fri, 21 Jun 2019 16:47:05 +0300 Subject: [MTS-MTQ] refactoring: Makefile build static library option fix Generate index to archive. instead of ranlib. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 3ace73f..8472075 100644 --- a/Makefile +++ b/Makefile @@ -51,7 +51,7 @@ LDFLAGS += -s -shared -Wl,-soname,$(APPNAME).so.0 all: $(APPNAME).a $(SONAME) $(APPNAME).a: $(OBJS) - $(AR) -r $@ $? + $(AR) -rs $@ $? $(SONAME): $(OBJS) $(CC) $(LDFLAGS) -o $@ $? $(LDLIBS) -- cgit v1.2.3