unirec: moved headers into include/, fixed distcheck

Author: cejkato2

unirec/Makefile.am

@@ -1,42 +1,22 @@
 ACLOCAL_AMFLAGS=-I m4
-DIST_SUBDIRS = unirec++ tests
-SUBDIRS = . unirec++
+DIST_SUBDIRS = include unirec++ tests
+SUBDIRS = include . unirec++
 
 if ENABLE_TESTS
 SUBDIRS += tests
 endif
 
 RPMDIR=RPMBUILD
 
-BUILT_SOURCES=ur_values.h ur_values.c ur_values.py
-
-ur_values.h: ur_values.sh
-	${top_srcdir}/ur_values.sh -i ${top_srcdir}
-
-ur_values.c: ur_values.h
-
-ur_values.py: ur_values.h
-
-
 lib_LTLIBRARIES=libunirec.la
+libunirec_la_CPPFLAGS=-I${srcdir}/include
 libunirec_la_CFLAGS=-fPIC
 libunirec_la_LDFLAGS=-static -ltrap
-libunirec_la_SOURCES=unirec.c unirec.h ur_values.c ur_values.h inline.h ipaddr.h macaddr.h links.h ur_time.h unirec2csv.h 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
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = unirec.pc
 
-unirecincludedir=$(includedir)/unirec
-unirecinclude_HEADERS=unirec.h \
-		     inline.h \
-		     ipaddr.h \
-		     macaddr.h \
-		     links.h  \
-		     ur_time.h \
-		     unirec2csv.h \
-		     ip_prefix_search.h \
-		     ur_values.h
-
 bin_SCRIPTS=ur_values.sh ur_processor.sh
 
 EXTRA_DIST=values ur_values.sh ur_processor.sh \

unirec/configure.ac

@@ -3,9 +3,9 @@
 
 AC_PREREQ([2.63])
 AC_INIT([unirec], [2.9.7], [[email protected]])
-AC_CONFIG_SRCDIR([unirec.h])
+AC_CONFIG_SRCDIR([unirec.c])
 AC_CONFIG_HEADERS([config.h])
-AM_INIT_AUTOMAKE([silent-rules])
+AM_INIT_AUTOMAKE([subdir-objects silent-rules])
 AM_SILENT_RULES([yes])
 RELEASE=1
 AC_SUBST(RELEASE)
@@ -99,6 +99,9 @@ fi
 
 AC_CONFIG_FILES([Makefile
 		 unirec.pc
+		 include/Makefile
+		 include/unirec/Makefile
+		 include/unirec++/Makefile
 		 unirec++/unirec++.pc
 		 unirec++/Makefile
 		 unirec.spec

unirec/include/Makefile.am

@@ -0,0 +1,2 @@
+SUBDIRS = unirec unirec++
+

unirec/include/unirec++/Makefile.am

@@ -0,0 +1,17 @@
+unirecppincludedir=$(includedir)/unirec++
+unirecppinclude_HEADERS=bidirectionalInterface.hpp \
+	inputInterface.hpp \
+	ipAddress.hpp \
+	macAddress.hpp \
+	outputInterface.hpp \
+	trapModuleInfo.hpp \
+	unirecArray.hpp \
+	unirecException.hpp \
+	unirec.hpp \
+	unirecRecord.hpp \
+	unirecRecordView.hpp \
+	unirecTypes.hpp \
+	unirecTypeTraits.hpp \
+	urTime.hpp
+
+