unirec: rpm: fixed missing ur_values issue

Author: cejkato2

unirec/Makefile.am

@@ -12,7 +12,19 @@ lib_LTLIBRARIES=libunirec.la
 libunirec_la_CPPFLAGS=-I${srcdir}/include
 libunirec_la_CFLAGS=-fPIC
 libunirec_la_LDFLAGS=-static -ltrap
-libunirec_la_SOURCES=unirec.c include/unirec/ur_values.c unirec2csv.c ip_prefix_search.c ipps_internal.h
+libunirec_la_SOURCES=unirec.c ur_values.c unirec2csv.c ip_prefix_search.c ipps_internal.h
+
+BUILT_SOURCES=ur_values.h ur_values.c ur_values.py
+
+ur_values.h: ${top_srcdir}/ur_values.sh
+	${top_srcdir}/ur_values.sh -i ${top_srcdir}
+
+ur_values.c: ur_values.h
+
+ur_values.py: ur_values.h
+
+unirecincludedir=$(includedir)/unirec
+unirecinclude_HEADERS=ur_values.h
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = unirec.pc
@@ -65,9 +77,6 @@ endif
 deb-clean:
 	rm -rf unirec_*.build unirec_*.changes unirec_*.deb unirec-dev_*.deb unirec_*.orig.tar.gz unirec-*.tar.gz unirec-@VERSION@
 
-install-exec-hook:
-	rm -f $(DESTDIR)$(libdir)/libunirec.la
-
 clean-local: rpm-clean deb-clean
 	find \( -name ur_values.c -o -name ur_values.h -o -name ur_values.py \) -exec rm -f {} + || true
 	find \( -name fields.c -o -name fields.h \) -exec rm -f {} + || true
@@ -78,7 +87,8 @@ coverage: check
 	genhtml coverage.info --output-directory out 2>/dev/null || echo "Skipped coverage analysis"
 
 install-exec-hook:
-	rm -f $(DESTDIR)$(libdir)/libunirec.la
+	rm -f $(DESTDIR)$(libdir)/libunirec.la $(DESTDIR)$(libdir)/libunirec++.la
 
 uninstall-hook:
-	rm -f $(DESTDIR)$(libdir)/libunirec.la $(DESTDIR)$(libdir)/libunirec.a
+	rm -f $(DESTDIR)$(libdir)/libunirec.la $(DESTDIR)$(libdir)/libunirec++.la $(DESTDIR)$(libdir)/libunirec.a
+

unirec/include/unirec/Makefile.am

@@ -6,16 +6,5 @@ unirecinclude_HEADERS=unirec.h \
 		     links.h  \
 		     ur_time.h \
 		     unirec2csv.h \
-		     ip_prefix_search.h \
-		     ur_values.h
-
-BUILT_SOURCES=ur_values.h ur_values.c ur_values.py
-
-ur_values.h: ${top_srcdir}/ur_values.sh
-	${top_srcdir}/ur_values.sh -i ${top_srcdir}
-
-ur_values.c: ur_values.h
-
-ur_values.py: ur_values.h
-
+		     ip_prefix_search.h
 

unirec/include/unirec/unirec.h

@@ -59,7 +59,7 @@ extern "C" {
 #include "macaddr.h"
 #include "ur_time.h"
 #include "links.h"
-#include "ur_values.h"
+#include <ur_values.h>
 #include <libtrap/trap.h>
 
 //General setting

unirec/unirec.c

@@ -59,7 +59,7 @@
 #include <unirec/inline.h>
 #include <libtrap/trap.h>
 #include <inttypes.h>
-#include <unirec/ur_values.c>
+#include "ur_values.c"
 
 #ifndef MAX
 #define MAX(A, B) ((A >= B) ? (A) : (B))