change jsoncpp recipe/makefile to build shared library

7 files changed, 166 insertions, 22 deletions

diff --git a/recipes-support/jsoncpp/jsoncpp-1.6.0/Makefile b/recipes-support/jsoncpp/jsoncpp-1.6.0/Makefile
index 3be3743..7df3d63 100644
--- a/recipes-support/jsoncpp/jsoncpp-1.6.0/Makefile
+++ b/recipes-support/jsoncpp/jsoncpp-1.6.0/Makefile
@@ -16,29 +16,32 @@ json_reader.d \
 json_value.d \
 json_writer.d 
 
-all: libjsoncpp.a
+TARGET = libjsoncpp.so
 
-libjsoncpp.a: $(OBJS)
+all: $(TARGET)
+
+libjsoncpp.so: $(OBJS)
 	@echo 'Building target: $@'
-	$(AR) -r  libjsoncpp.a $(OBJS)
+	#$(AR) -r  libjsoncpp.a $(OBJS)
+	$(CXX) ${LDFLAGS} -shared -o $@ $^
 	@echo 'Finished building target: $@'
 	@echo ' '
 
 %.o: src/lib_json/%.cpp
 	@echo 'Building file: $<'
-	$(CXX) $(CFLAGS) -Iinclude -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
+	$(CXX) $(CFLAGS) -Iinclude -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -fPIC -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 
 install:
-	mkdir -p $(DESTDIR)$(libdir)
-	mkdir -p $(DESTDIR)$(includedir)/jsoncpp/json
-	cp libjsoncpp.a $(DESTDIR)$(libdir)/
-	cp include/json/* $(DESTDIR)$(includedir)/jsoncpp/json/
+	install -d $(DESTDIR)/usr/include/json
+	install -m 644 include/json/*.h $(DESTDIR)/usr/include/json
+	mkdir -p $(DESTDIR)/usr/lib
+	cp libjsoncpp.so $(DESTDIR)/usr/lib
 
 # Other Targets
 clean:
-	-$(RM) $(OBJS)$(CPP_DEPS) libjsoncpp.a
+	-$(RM) $(OBJS)$(CPP_DEPS) libjsoncpp.so
 	-@echo ' '
 
 .PHONY: all clean dependents
diff --git a/recipes-support/jsoncpp/jsoncpp_1.6.0.bb b/recipes-support/jsoncpp/jsoncpp_1.6.0.bb
index 80f3f70..8c8454d 100644
--- a/recipes-support/jsoncpp/jsoncpp_1.6.0.bb
+++ b/recipes-support/jsoncpp/jsoncpp_1.6.0.bb
@@ -4,10 +4,6 @@ HOMEPAGE = "https://github.com/open-source-parsers/jsoncpp"
 LICENSE = "PD"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c56ee55c03a55f8105b969d8270632ce"
 DEPENDS = ""
-BBCLASSEXTEND = "native"
-
-# static lib only, require staticdev
-RDEPENDS_${PN}-dev = "${PN}-staticdev"
 
 #tag 1.6.0
 SRCREV="cbe7e7c9cbd39d864588c5cf2436690634562d3f"
@@ -16,7 +12,7 @@ SRC_URI = " git://github.com/open-source-parsers/jsoncpp.git;protocol=git \
             file://Makefile \
           "
 
-PR = "r1"
+PR = "r6"
 
 S = "${WORKDIR}/git"
 
@@ -25,10 +21,13 @@ do_compile() {
 	oe_runmake
 }
 
-do_install() {
-	oe_runmake install DESTDIR=${D}
+do_install () {
+	install -d ${D}/usr/lib
+	install -m 0755 ${S}/libjsoncpp.so ${D}/usr/lib
+	install -d ${D}${includedir}/jsoncpp/json
+	install -m 0755 ${S}/include/json/*.h ${D}${includedir}/jsoncpp/json
 }
 
-# this recipe provides dev packages only (static lib)
-PACKAGES = "${PN}-dev ${PN}-staticdev ${PN}-dbg"
-
+FILES_SOLIBSDEV = ""
+FILES_${PN} += "${libdir}/*.so"
+FILES_{PN}-dev += "${libdir}/*.so"
diff --git a/recipes-support/multitech/jsparser/Makefile b/recipes-support/multitech/jsparser/Makefile
new file mode 100644
index 0000000..8fe64f6
--- /dev/null
+++ b/recipes-support/multitech/jsparser/Makefile
@@ -0,0 +1,69 @@
+
+includedir ?= /usr/include
+libdir ?= /usr/lib
+
+LIBS := -lmts -ljsoncpp -lrt
+
+OBJS += \
+Version.o \
+main.o
+
+CPP_DEPS += \
+Version.d \
+main.d
+
+all: postbuild
+
+prebuild:
+	@echo PRE-BUILD
+	@echo 'Removing previous version components started'
+	-$(RM) Version.o
+	-$(RM) Version.d
+	-$(RM) Version.cpp
+	@echo 'Removing previous version components complete'
+	@echo ' '
+	
+postbuild: mainbuild
+	@echo POST-BUILD
+	@echo ' '
+
+mainbuild: prebuild
+	@echo MAIN-BUILD
+	@$(MAKE) --no-print-directory target
+
+target: $(OBJS)
+	@echo 'Building target: $@'
+	$(CXX) $(CFLAGS) $(LDFLAGS) -o jsparser $(OBJS) $(LIBS)
+	@echo 'Finished building target: $@'
+	@echo ' '
+
+Version.o: Version.cpp
+	@echo 'Building file: $<'
+	$(CXX) $(CFLAGS) -Iinclude -Wall -c -std=c++0x -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+Version.cpp:
+	@echo 'Creating file: Version.cpp'
+	/bin/echo -e "//Pre-Build Auto-Generated Source\n#include \"Version.h\"\n\nconst std::string Version::version(\"$(shell git describe)\");" > Version.cpp
+	@echo 'Finished creating: Version.cpp'
+	@echo ' '
+
+main.o: main.cpp
+	@echo 'Building file: $<'
+	$(CXX) $(CFLAGS) -I=$(includedir)/jsoncpp -Wall -c -std=c++0x -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+install:
+	install -d $(DESTDIR)/usr/bin
+	install -m 0755 jsparser $(DESTDIR)/usr/bin
+
+clean:
+	-$(RM) $(OBJS) $(CPP_DEPS) jsparser
+	-@echo ' '
+
+.PHONY: all clean dependents install target
+.SECONDARY:
+
+
diff --git a/recipes-support/multitech/jsparser_0.3.bb b/recipes-support/multitech/jsparser_0.3.bb
index c289d30..cd419c6 100644
--- a/recipes-support/multitech/jsparser_0.3.bb
+++ b/recipes-support/multitech/jsparser_0.3.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "MultiTech Command Line JSON Parser"
 LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f"
 DEPENDS = "jsoncpp libmts"
-RDEPENDS_${PN} += "bash"
+RDEPENDS_${PN} += "bash jsoncpp"
 
 PR = "r0"
 SRCREV="${PV}"
diff --git a/recipes-support/multitech/libmts-io/Makefile b/recipes-support/multitech/libmts-io/Makefile
new file mode 100644
index 0000000..dc37858
--- /dev/null
+++ b/recipes-support/multitech/libmts-io/Makefile
@@ -0,0 +1,73 @@
+include version
+
+APPNAME = libmts-io
+SONAME = $(APPNAME).so.$(VERSION)
+libdir ?= /usr/lib
+
+OBJS += \
+	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_ICellularRadio.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
+
+CC := $(CXX)
+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
+
+.PHONY: all clean install
+
+all: $(APPNAME).a $(SONAME)
+
+$(APPNAME).a: $(OBJS)
+	$(AR) -rs $@ $?
+
+$(SONAME): $(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 $(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:
+	$(RM) $(OBJS) $(APPNAME).a $(SONAME) $(DEPS)
+
diff --git a/recipes-support/multitech/radio-cmd_0.4.bb b/recipes-support/multitech/radio-cmd_0.4.bb
index b8e5b23..822f178 100644
--- a/recipes-support/multitech/radio-cmd_0.4.bb
+++ b/recipes-support/multitech/radio-cmd_0.4.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "MultiTech cellular radio command tool"
 HOMEPAGE = "http://www.multitech.net/"
 LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f"
-
+RDEPENDS_${PN} += "jsoncpp"
 DEPENDS = "jsoncpp libmts libmts-io"
 
 PR = "r0"
diff --git a/recipes-support/multitech/radio-query_0.7.bb b/recipes-support/multitech/radio-query_0.7.bb
index 5e0b60a..7ce0976 100644
--- a/recipes-support/multitech/radio-query_0.7.bb
+++ b/recipes-support/multitech/radio-query_0.7.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "MultiTech cellular radio query tool"
 HOMEPAGE = "http://www.multitech.net/"
 LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f"
-
+RDEPENDS_${PN} += "jsoncpp"
 DEPENDS = "jsoncpp libmts libmts-io"
 
 PR = "r0"