From 8decc63b8b82e49113bc0a9939487dabbeaf3513 Mon Sep 17 00:00:00 2001
From: Jason Reiss <jreiss@multitech.com>
Date: Tue, 1 Oct 2019 14:16:27 -0500
Subject: change jsoncpp recipe/makefile to build shared library

---
 recipes-support/jsoncpp/jsoncpp-1.6.0/Makefile | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'recipes-support/jsoncpp/jsoncpp-1.6.0/Makefile')

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
-- 
cgit v1.2.3


From 1b92cb4c4b8c66f98f0f0c8551ea2be9fc423767 Mon Sep 17 00:00:00 2001
From: Andrii Pientsov <andrii.pientsov@globallogic.com>
Date: Thu, 21 May 2020 08:17:34 +0300
Subject: Remove duplicate recipes-support

---
 recipes-support/jsoncpp/jsoncpp-1.6.0/Makefile | 49 --------------------------
 1 file changed, 49 deletions(-)
 delete mode 100644 recipes-support/jsoncpp/jsoncpp-1.6.0/Makefile

(limited to 'recipes-support/jsoncpp/jsoncpp-1.6.0/Makefile')

diff --git a/recipes-support/jsoncpp/jsoncpp-1.6.0/Makefile b/recipes-support/jsoncpp/jsoncpp-1.6.0/Makefile
deleted file mode 100644
index 7df3d63..0000000
--- a/recipes-support/jsoncpp/jsoncpp-1.6.0/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-includedir ?= /usr/include
-libdir ?= /usr/lib
-
-CPP_SRCS += \
-src/lib_json/json_reader.cpp \
-src/lib_json/json_value.cpp \
-src/lib_json/json_writer.cpp 
-
-OBJS += \
-json_reader.o \
-json_value.o \
-json_writer.o 
-
-CPP_DEPS += \
-json_reader.d \
-json_value.d \
-json_writer.d 
-
-TARGET = libjsoncpp.so
-
-all: $(TARGET)
-
-libjsoncpp.so: $(OBJS)
-	@echo 'Building target: $@'
-	#$(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)" -fPIC -o "$@" "$<"
-	@echo 'Finished building: $<'
-	@echo ' '
-
-install:
-	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.so
-	-@echo ' '
-
-.PHONY: all clean dependents
-.SECONDARY:
-
-- 
cgit v1.2.3