Переименовал xxx_template.h --> xxx.tcc

conf/libuniset.spec

@@ -15,7 +15,7 @@ Source: /var/ftp/pvt/Etersoft/Ourside/unstable/sources/tarball/%name-%version.ta
 
 # manually removed: glibc-devel-static
 # Automatically added by buildreq on Fri Nov 26 2010
-BuildRequires: glibc-devel-static libcomedi-devel libcommoncpp2-devel libomniORB-devel libsigc++2.0-devel python-modules xsltproc
+BuildRequires: libcomedi-devel libcommoncpp2-devel libomniORB-devel libsigc++2.0-devel python-modules xsltproc
 
 # Using old package name instead of libmysqlclient-devel it absent in branch 5.0 for yauza
 BuildRequires: libMySQL-devel
@@ -138,6 +138,7 @@ rm -f %buildroot%_libdir/*.la
 %dir %_includedir/%oname/
 %_includedir/%oname/*.h
 %_includedir/%oname/*.hh
+%_includedir/%oname/*.tcc
 %_includedir/%oname/IOs/
 %_includedir/%oname/modbus/
 %_includedir/%oname/mysql/

include/CallBackTimer.h

@@ -145,5 +145,5 @@ class CallBackTimer
 		};
 };
 
-#include "CallBackTimer_template.h"
+#include "CallBackTimer.tcc"
 # endif //CallBackTimer_H_

include/CallBackTimer_template.h → include/CallBackTimer.tcc

@@ -21,8 +21,8 @@
  *  \author Pavel Vainerman
 */
 // -------------------------------------------------------------------------- 
-# ifndef CallBackTimer_TEMPLATE_H_
-# define CallBackTimer_TEMPLATE_H_
+# ifndef CallBackTimer_TCC_H_
+# define CallBackTimer_TCC_H_
 // -------------------------------------------------------------------------- 
 #include <unistd.h>
 #include <sstream>
@@ -180,4 +180,4 @@ int CallBackTimer<Caller>::getCurrent( int id )
 }
 // ------------------------------------------------------------------------------------------
 
-# endif //CallBackTimer_H_
+# endif //CallBackTimer_TCC_H_

include/Makefile.am

@@ -7,7 +7,7 @@ include $(top_builddir)/conf/common.mk
 
 
 # install
-devel_include_HEADERS = *.h *.hh
+devel_include_HEADERS = *.h *.hh *.tcc
 devel_includedir = $(pkgincludedir)
 
 all-local:

include/TriggerAND.h

@@ -115,6 +115,6 @@ class TriggerAND
 };
 
 //---------------------------------------------------------------------------
-#include "TriggerAND_template.h"
+#include "TriggerAND.tcc"
 //---------------------------------------------------------------------------
 #endif

include/TriggerOR.h

@@ -116,6 +116,6 @@ class TriggerOR
 };
 
 //---------------------------------------------------------------------------
-#include "TriggerOR_template.h"
+#include "TriggerOR.tcc"
 //---------------------------------------------------------------------------
 #endif

include/TriggerOutput.h

@@ -122,6 +122,6 @@ class TriggerOutput
 };
 
 //---------------------------------------------------------------------------
-#include "TriggerOutput_template.h"
+#include "TriggerOutput.tcc"
 //---------------------------------------------------------------------------
 #endif