Переделал "упаковку" заголовочных файлов. Теперь header-ы раскиданы

conf/libuniset2.spec

@@ -12,8 +12,8 @@
 %define oname uniset2
 
 Name: libuniset2
-Version: 2.0
-Release: alt35.1
+Version: 2.1
+Release: alt1
 
 Summary: UniSet - library for building distributed industrial control systems
 
@@ -310,15 +310,6 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
 %_includedir/%oname/*.hh
 %_includedir/%oname/*.tcc
 %_includedir/%oname/modbus/
-%if_enabled mysql
-%_includedir/%oname/mysql/
-%endif
-%if_enabled sqlite
-%_includedir/%oname/sqlite/
-%endif
-%if_enabled pgsql
-%_includedir/%oname/pgsql/
-%endif
 
 %_libdir/libUniSet2.so
 %_datadir/idl/%oname/
@@ -331,6 +322,8 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
 
 %files extension-mysql-devel
 %_pkgconfigdir/libUniSet2MySQL.pc
+%dir %_includedir/%oname/extensions/mysql
+%_includedir/%oname/extensions/mysql/
 %endif
 
 %if_enabled sqlite
@@ -340,6 +333,8 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
 
 %files extension-sqlite-devel
 %_pkgconfigdir/libUniSet2SQLite.pc
+%dir %_includedir/%oname/extensions/sqlite
+%_includedir/%oname/extensions/sqlite/
 %endif
 
 %if_enabled pgsql
@@ -349,6 +344,8 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
 
 %files extension-pgsql-devel
 %_pkgconfigdir/libUniSet2PostgreSQL.pc
+%dir %_includedir/%oname/extensions/pgsql
+%_includedir/%oname/extensions/pgsql/
 %endif
 
 %if_enabled python
@@ -397,6 +394,8 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
 %files extension-logicproc-devel
 %_pkgconfigdir/libUniSet2Log*.pc
 %_libdir/libUniSet2LP*.so
+%dir %_includedir/%oname/extensions/logicproc
+%_includedir/%oname/extensions/logicproc/
 %endif
 
 %if_enabled rrd
@@ -407,6 +406,8 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
 %files extension-rrd-devel
 %_pkgconfigdir/libUniSet2RRD*.pc
 %_libdir/libUniSet2RRD*.so
+%dir %_includedir/%oname/extensions/rrd
+%_includedir/%oname/extensions/rrd/
 %endif
 
 %if_enabled io
@@ -419,6 +420,8 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
 %files extension-io-devel
 %_libdir/libUniSet2IO*.so
 %_pkgconfigdir/libUniSet2IO*.pc
+%dir %_includedir/%oname/extensions/io
+%_includedir/%oname/extensions/io/
 %endif
 
 %files extension-common-devel
@@ -437,6 +440,13 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
 %_pkgconfigdir/libUniSet2Network*.pc
 %_pkgconfigdir/libUniSet2UNet*.pc
 
+%exclude %_includedir/%oname/extensions/mysql
+%exclude %_includedir/%oname/extensions/sqlite
+%exclude %_includedir/%oname/extensions/pgsql
+%exclude %_includedir/%oname/extensions/logicproc
+%exclude %_includedir/%oname/extensions/io
+%exclude %_includedir/%oname/extensions/rrd
+
 #%_pkgconfigdir/libUniSet2SMDBServer.pc
 #%_pkgconfigdir/libUniSet2*.pc
 %exclude %_pkgconfigdir/libUniSet2.pc
@@ -445,6 +455,9 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
 # ..
 
 %changelog
+* Thu May 28 2015 Pavel Vainerman <pv@altlinux.ru> 2.1-alt1
+- repack header files..
+
 * Tue May 26 2015 Pavel Vainerman <pv@etersoft.ru> 2.0-alt35.1
 - PassiveTimer: uset chrono
 - LogServer: add --list function

configure.ac

@@ -3,7 +3,7 @@
 # See doc: http://www.gnu.org/software/hello/manual/autoconf/Generic-Programs.html
 
 # AC_PREREQ(2.59)
-AC_INIT([uniset2], [2.0.0], pv@etersoft.ru)
+AC_INIT([uniset2], [2.1.0], pv@etersoft.ru)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME,AC_PACKAGE_VERSION)
 
 # AC_CONFIG_MACRO_DIR([m4])
@@ -30,7 +30,7 @@ AC_ENABLE_SHARED(yes)
 AC_ENABLE_STATIC(no)
 AM_PROG_LIBTOOL
 
-LIBVER=2:0:0
+LIBVER=2:1:0
 AC_SUBST(LIBVER)
 
 ASTYLE_OPT="-A1 -T -C -S -N -L -w -Y -M -f -p --mode=c --lineend=linux --align-reference=type --align-pointer=type --suffix=none --style=ansi"

extensions/DBServer-MySQL/Makefile.am

@@ -19,7 +19,7 @@ mysql_test_SOURCES = test.cc
 
 # install
 devel_include_HEADERS = *.h
-devel_includedir = $(includedir)/@PACKAGE@/mysql
+devel_includedir = $(includedir)/@PACKAGE@/extensions/mysql
 
 pkgconfigdir	= $(libdir)/pkgconfig
 pkgconfig_DATA  = libUniSet2MySQL.pc

extensions/DBServer-MySQL/libUniSet2MySQL.pc.in

@@ -8,4 +8,4 @@ Description: Support library for libUniSet2MySQL
 Requires: libUniSet2
 Version: @VERSION@
 Libs: -L${libdir} -lUniSet2-mysql -lmysqlclient
-Cflags: -I${includedir}/@PACKAGE@ -I${includedir}/@PACKAGE@/mysql
+Cflags: -I${includedir}/@PACKAGE@ -I${includedir}/@PACKAGE@/extensions/mysql

extensions/DBServer-PostgreSQL/Makefile.am

@@ -22,7 +22,7 @@ pgsql_test_SOURCES = test.cc
 
 # install
 devel_include_HEADERS = *.h
-devel_includedir = $(includedir)/@PACKAGE@/pgsql
+devel_includedir = $(includedir)/@PACKAGE@/extensions/pgsql
 
 pkgconfigdir    = $(libdir)/pkgconfig
 pkgconfig_DATA  = libUniSet2PostgreSQL.pc

extensions/DBServer-PostgreSQL/libUniSet2PostgreSQL.pc.in

@@ -8,4 +8,4 @@ Description: Support library for libUniSet2PostgreSQL
 Requires: libUniSet2 libpqxx
 Version: @VERSION@
 Libs: -L${libdir} -lUniSet2-pgsql
-Cflags: -I${includedir}/@PACKAGE@ -I${includedir}/@PACKAGE@/pgsql
+Cflags: -I${includedir}/@PACKAGE@ -I${includedir}/@PACKAGE@/extensions/pgsql

extensions/DBServer-SQLite/Makefile.am

@@ -20,7 +20,7 @@ sqlite_test_SOURCES = test.cc
 
 # install
 devel_include_HEADERS = *.h
-devel_includedir = $(includedir)/@PACKAGE@/sqlite
+devel_includedir = $(includedir)/@PACKAGE@/extensions/sqlite
 
 pkgconfigdir	= $(libdir)/pkgconfig
 pkgconfig_DATA  = libUniSet2SQLite.pc

extensions/DBServer-SQLite/libUniSet2SQLite.pc.in

@@ -8,4 +8,4 @@ Description: Support library for libUniSet2SQLite
 Requires: libUniSet2 sqlite3
 Version: @VERSION@
 Libs: -L${libdir} -lUniSet2-sqlite
-Cflags: -I${includedir}/@PACKAGE@ -I${includedir}/@PACKAGE@/sqlite
+Cflags: -I${includedir}/@PACKAGE@ -I${includedir}/@PACKAGE@/extensions/sqlite

extensions/IOControl/Makefile.am

@@ -42,13 +42,13 @@ libUniSet2IOControl_la_SOURCES = ComediInterface.cc IOControl.cc
 
 # install
 devel_include_HEADERS = *.h
-devel_includedir = $(pkgincludedir)/extensions
+devel_includedir = $(pkgincludedir)/extensions/io
 
 pkgconfigdir 	= $(libdir)/pkgconfig
 pkgconfig_DATA 	= libUniSet2IOControl.pc
 
-all-local:
-	ln -sf ../IOControl/$(devel_include_HEADERS) ../include
+#all-local:
+#	ln -sf ../IOControl/$(devel_include_HEADERS) ../include
 
 include $(top_builddir)/include.mk
 

extensions/IOControl/libUniSet2IOControl.pc.in

@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: libUniSet2IOControl
 Description: Support library for UniSet2IOControl
-Requires: libUniSet2Extensions
+Requires: libUniSet2Extensions comedilib
 Version: @VERSION@
 Libs: -L${libdir} -lUniSet2IOControl
-Cflags: -I${includedir}/@PACKAGE@
+Cflags: -I${includedir}/@PACKAGE@/extensions/io

extensions/LogicProcessor/Makefile.am

@@ -34,13 +34,13 @@ bin_PROGRAMS = @PACKAGE@-logicproc @PACKAGE@-plogicproc
 
 # install
 devel_include_HEADERS = *.h
-devel_includedir = $(pkgincludedir)/extensions
+devel_includedir = $(pkgincludedir)/extensions/logicproc
 
 pkgconfigdir 	= $(libdir)/pkgconfig
 pkgconfig_DATA 	= libUniSet2LogicProcessor.pc
 
-all-local:
-	ln -sf ../LogicProcessor/$(devel_include_HEADERS) ../include
+#all-local:
+#	ln -sf ../LogicProcessor/$(devel_include_HEADERS) ../include
 
 # SUBDIRS=tests
 

extensions/LogicProcessor/libUniSet2LogicProcessor.pc.in

@@ -8,4 +8,4 @@ Description: Support library for UniSet2LogicProcessor
 Requires: libUniSet2Extensions
 Version: @VERSION@
 Libs: -L${libdir} -lUniSet2LProcessor
-Cflags: -I${includedir}/@PACKAGE@
+Cflags: -I${includedir}/@PACKAGE@/extensions/logicproc

extensions/ModbusMaster/Makefile.am

@@ -83,7 +83,7 @@ devel_includedir = $(pkgincludedir)/extensions
 pkgconfigdir 	= $(libdir)/pkgconfig
 pkgconfig_DATA 	= libUniSet2MBTCPMaster.pc libUniSet2RTU.pc
 
-all-local:
-	ln -sf ../ModbusMaster/$(devel_include_HEADERS) ../include
+#all-local:
+#	ln -sf ../ModbusMaster/$(devel_include_HEADERS) ../include
 
 include $(top_builddir)/include.mk

extensions/ModbusSlave/Makefile.am

@@ -33,8 +33,8 @@ devel_includedir = $(pkgincludedir)/extensions
 pkgconfigdir 	= $(libdir)/pkgconfig
 pkgconfig_DATA 	= libUniSet2MBSlave.pc
 
-all-local:
-	ln -sf ../ModbusSlave/$(devel_include_HEADERS) ../include
+#all-local:
+#	ln -sf ../ModbusSlave/$(devel_include_HEADERS) ../include
 
 include $(top_builddir)/include.mk
 

extensions/RRDServer/Makefile.am

@@ -28,13 +28,13 @@ libUniSet2RRDServer_la_SOURCES 	= RRDServer.cc
 
 # install
 devel_include_HEADERS = *.h
-devel_includedir = $(pkgincludedir)/extensions
+devel_includedir = $(pkgincludedir)/extensions/rrd
 
 pkgconfigdir 	= $(libdir)/pkgconfig
 pkgconfig_DATA 	= libUniSet2RRDServer.pc
 
-all-local:
-	ln -sf ../RRDServer/$(devel_include_HEADERS) ../include
+#all-local:
+#	ln -sf ../RRDServer/$(devel_include_HEADERS) ../include
 
 include $(top_builddir)/include.mk
 

extensions/RRDServer/libUniSet2RRDServer.pc.in

@@ -8,4 +8,4 @@ Description: Support library for UniSet2RRDServer
 Requires: libUniSet2Extensions librrd
 Version: @VERSION@
 Libs: -L${libdir} -lUniSet2RRDServer
-Cflags: -I${includedir}/@PACKAGE@
+Cflags: -I${includedir}/@PACKAGE@/extensions/rrd

extensions/SMDBServer/Makefile.am

@@ -33,7 +33,7 @@ devel_includedir = $(pkgincludedir)/extensions
 pkgconfigdir 	= $(libdir)/pkgconfig
 pkgconfig_DATA 	= libUniSet2SMDBServer.pc
 
-all-local:
-	ln -sf ../SMDBServer/$(devel_include_HEADERS) ../include
+#all-local:
+#	ln -sf ../SMDBServer/$(devel_include_HEADERS) ../include
 
 include $(top_builddir)/include.mk

extensions/SharedMemory/Makefile.am

@@ -23,7 +23,7 @@ devel_includedir = $(pkgincludedir)/extensions
 pkgconfigdir 	= $(libdir)/pkgconfig
 pkgconfig_DATA 	= libUniSet2SharedMemory.pc
 
-all-local:
-	ln -sf ../SharedMemory/$(devel_include_HEADERS) ../include
+#all-local:
+#	ln -sf ../SharedMemory/$(devel_include_HEADERS) ../include
 
 include $(top_builddir)/include.mk

extensions/UNetUDP/Makefile.am

@@ -31,7 +31,7 @@ devel_includedir = $(pkgincludedir)/extensions
 pkgconfigdir 	= $(libdir)/pkgconfig
 pkgconfig_DATA 	= libUniSet2UNetUDP.pc
 
-all-local:
-	ln -sf ../UNetUDP/$(devel_include_HEADERS) ../include
+#all-local:
+#	ln -sf ../UNetUDP/$(devel_include_HEADERS) ../include
 
 include $(top_builddir)/include.mk

extensions/UniNetwork/Makefile.am

@@ -19,7 +19,7 @@ libUniSet2Network_la_SOURCES = UniExchange.cc
 	$(top_builddir)/extensions/lib/libUniSet2Extensions.la \
 	$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
 	$(COMCPP_LIBS)
-@PACKAGE@_network_CPPFLAGS	= $(SIGC_CFLAGS) $(COMCPP_CFLAGS) -I$(top_builddir)/extensions/include
+@PACKAGE@_network_CPPFLAGS	= $(SIGC_CFLAGS) $(COMCPP_CFLAGS) -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory
 @PACKAGE@_network_SOURCES 	= uninet.cc
 
 # install
@@ -29,7 +29,7 @@ devel_includedir = $(pkgincludedir)/extensions
 pkgconfigdir 	= $(libdir)/pkgconfig
 pkgconfig_DATA 	= libUniSet2Network.pc
 
-all-local:
-	ln -sf ../UniNetwork/$(devel_include_HEADERS) ../include
+#all-local:
+#	ln -sf ../UniNetwork/$(devel_include_HEADERS) ../include
 
 include $(top_builddir)/include.mk

extensions/libUniSet2Extensions.pc.in

@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: libUniSet2Extensions
 Description: Support library for UniSet2 Extensions
-Requires: libUniSet2 comedilib
+Requires: libUniSet2
 Version: @VERSION@
 Libs: -L${libdir} -lUniSet2Extensions
 Cflags: -I${includedir}/@PACKAGE@