fixup! unirec: rpm: fixed missing ur_values issue

Author: cejkato2

unirec/Makefile.am

@@ -1,5 +1,5 @@
 ACLOCAL_AMFLAGS=-I m4
-DIST_SUBDIRS = include unirec++ tests
+DIST_SUBDIRS = include . unirec++ tests
 SUBDIRS = include . unirec++
 
 if ENABLE_TESTS
@@ -12,19 +12,11 @@ lib_LTLIBRARIES=libunirec.la
 libunirec_la_CPPFLAGS=-I${srcdir}/include
 libunirec_la_CFLAGS=-fPIC
 libunirec_la_LDFLAGS=-static -ltrap
-libunirec_la_SOURCES=unirec.c ur_values.c unirec2csv.c ip_prefix_search.c ipps_internal.h
+libunirec_la_SOURCES=unirec.c include/unirec/ur_values.c unirec2csv.c ip_prefix_search.c ipps_internal.h
 
-BUILT_SOURCES=ur_values.h ur_values.c ur_values.py
+BUILT_SOURCES=include/unirec/ur_values.c
 
-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
+libunirec_la: include/unirec/ur_values.c
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = unirec.pc
@@ -90,5 +82,5 @@ install-exec-hook:
 	rm -f $(DESTDIR)$(libdir)/libunirec.la $(DESTDIR)$(libdir)/libunirec++.la
 
 uninstall-hook:
-	rm -f $(DESTDIR)$(libdir)/libunirec.la $(DESTDIR)$(libdir)/libunirec++.la $(DESTDIR)$(libdir)/libunirec.a
+	rm -f $(DESTDIR)$(libdir)/libunirec.la $(DESTDIR)$(libdir)/libunirec++.la $(DESTDIR)$(libdir)/libunirec.a $(DESTDIR)$(libdir)/libunirec++.a $(DESTDIR)$(libdir)/libunirec++.so.*
 

unirec/include/unirec/Makefile.am

@@ -6,5 +6,16 @@ unirecinclude_HEADERS=unirec.h \
 		     links.h  \
 		     ur_time.h \
 		     unirec2csv.h \
+		     ur_values.h \
+		     ur_values.c \
 		     ip_prefix_search.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
+

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 "ur_values.c"
+#include "include/unirec/ur_values.c"
 
 #ifndef MAX
 #define MAX(A, B) ((A >= B) ? (A) : (B))