[SCM] tango branch, upstream, updated. upstream/7.2.6-4-g657cebf
Picca Frédéric-Emma?==?UTF-8?Q?nuel
picca at debian.org
Sat Sep 15 19:56:13 UTC 2012
The following commit has been merged in the upstream branch:
commit 479c3ee0fd8fb630eabafd52b954c5bf9ec2c0d2
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date: Wed May 30 20:52:10 2012 +0200
Imported Upstream version 8.0.5+dfsg
diff --git a/README b/README
index 1cfab71..8af9448 100644
--- a/README
+++ b/README
@@ -498,17 +498,17 @@ Changes between Tango distribution 7.2.6a and 8.0.5
---------------------------------------------------
- Updated C++ library to Release 8.0.5
-- Updated Log4Tango to Release 4.0.6
+- Updated Log4Tango to Release 4.0.7
- Updated Jive to Release 4.23
- Updated atkpanel to Release 4.4
-- Updated Pogo to Release 8.0.2
+- Updated Pogo to Release 8.0.3
- Updated Astor to Release 6.0.4
- Updated notifd2db to Release 1.13
- Updated tango_admin to Release 1.10
- Updated DbServer to Release 4.17
- Updated TangORB to Release 8.0.0
- Updated ATK to Release 4.3.6
-- Updated Starter to Release 5.4
+- Updated Starter to Release 5.5
- Updated TangoTest to Release 1.7.0
- Updated TangoAccessControl to Release 2.5
- Updated AccessControl to Release 2.5
diff --git a/TANGO_CHANGES b/TANGO_CHANGES
index dfd2bb3..c85b6e2 100644
--- a/TANGO_CHANGES
+++ b/TANGO_CHANGES
@@ -10,14 +10,16 @@ Tango 8 has been developed and tested using:
- omniORB 4.1.6
- zmq 3.1
-- log4tango 4.0.6
+- log4tango 4.0.7
-Changes between Log4tango 4.0.3 and Log4Tango 4.0.6
+Changes between Log4tango 4.0.3 and Log4Tango 4.0.7
---------------------------------------------------
- SourceForge bug 3156197
- Fix warnings when Tango is compiled -Wall -Wextra
- Add Windows port for Windows 64 bits VC10
+- Add ACLOCAL_AMFALGS in main Makefile.am
+- Update Doxyfile file
- Apply Alessio's patch:
- Re-enable Thread's name PatternComponent
- Add Thread's id PatternComponent
diff --git a/config/ltmain.sh b/config/ltmain.sh
old mode 100644
new mode 100755
diff --git a/cppserver/AbstractClass/AccessControl/Makefile.in b/cppserver/AbstractClass/AccessControl/Makefile.in
index 3cb5758..82a76db 100644
--- a/cppserver/AbstractClass/AccessControl/Makefile.in
+++ b/cppserver/AbstractClass/AccessControl/Makefile.in
@@ -209,7 +209,6 @@ VERSION_INFO = @VERSION_INFO@
ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
-ZMQ_PREFIX = @ZMQ_PREFIX@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/cppserver/database/Makefile.in b/cppserver/database/Makefile.in
index e27cb98..2c4286a 100644
--- a/cppserver/database/Makefile.in
+++ b/cppserver/database/Makefile.in
@@ -251,7 +251,6 @@ VERSION_INFO = @VERSION_INFO@
ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
-ZMQ_PREFIX = @ZMQ_PREFIX@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/cppserver/starter/Makefile.in b/cppserver/starter/Makefile.in
index 3b526a2..457a390 100644
--- a/cppserver/starter/Makefile.in
+++ b/cppserver/starter/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -119,7 +119,6 @@ CYGPATH_W = @CYGPATH_W@
DATADIR = @DATADIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DOXYGEN = @DOXYGEN@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -174,7 +173,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MYSQL = @MYSQL@
MYSQLCLIENT_CFLAGS = @MYSQLCLIENT_CFLAGS@
@@ -216,13 +214,11 @@ VERSION_INFO = @VERSION_INFO@
ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
-ZMQ_PREFIX = @ZMQ_PREFIX@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_aux_dir = @ac_aux_dir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -256,6 +252,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -379,7 +376,7 @@ clean-binPROGRAMS:
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
-Starter$(EXEEXT): $(Starter_OBJECTS) $(Starter_DEPENDENCIES) $(EXTRA_Starter_DEPENDENCIES)
+Starter$(EXEEXT): $(Starter_OBJECTS) $(Starter_DEPENDENCIES)
@rm -f Starter$(EXEEXT)
$(CXXLINK) $(Starter_OBJECTS) $(Starter_LDADD) $(LIBS)
@@ -525,15 +522,10 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- if test -z '$(STRIP)'; then \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- install; \
- else \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
- fi
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
clean-generic:
diff --git a/cppserver/tangoaccesscontrol/Makefile.in b/cppserver/tangoaccesscontrol/Makefile.in
index dd107a9..e94efad 100644
--- a/cppserver/tangoaccesscontrol/Makefile.in
+++ b/cppserver/tangoaccesscontrol/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -157,7 +157,6 @@ CYGPATH_W = @CYGPATH_W@
DATADIR = @DATADIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DOXYGEN = @DOXYGEN@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -212,7 +211,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MYSQL = @MYSQL@
MYSQLCLIENT_CFLAGS = @MYSQLCLIENT_CFLAGS@
@@ -254,13 +252,11 @@ VERSION_INFO = @VERSION_INFO@
ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
-ZMQ_PREFIX = @ZMQ_PREFIX@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_aux_dir = @ac_aux_dir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -294,6 +290,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -414,7 +411,7 @@ clean-binPROGRAMS:
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
-TangoAccessControl$(EXEEXT): $(TangoAccessControl_OBJECTS) $(TangoAccessControl_DEPENDENCIES) $(EXTRA_TangoAccessControl_DEPENDENCIES)
+TangoAccessControl$(EXEEXT): $(TangoAccessControl_OBJECTS) $(TangoAccessControl_DEPENDENCIES)
@rm -f TangoAccessControl$(EXEEXT)
$(CXXLINK) $(TangoAccessControl_OBJECTS) $(TangoAccessControl_LDADD) $(LIBS)
@@ -669,15 +666,10 @@ install-am: all-am
installcheck: installcheck-recursive
install-strip:
- if test -z '$(STRIP)'; then \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- install; \
- else \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
- fi
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
clean-generic:
diff --git a/cppserver/tangotest/Makefile.in b/cppserver/tangotest/Makefile.in
index edba3d6..a5c700f 100644
--- a/cppserver/tangotest/Makefile.in
+++ b/cppserver/tangotest/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -105,12 +105,6 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
- test -z "$$files" \
- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && rm -f $$files; }; \
- }
HEADERS = $(tangoinclude_HEADERS)
ETAGS = etags
CTAGS = ctags
@@ -138,7 +132,6 @@ CYGPATH_W = @CYGPATH_W@
DATADIR = @DATADIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DOXYGEN = @DOXYGEN@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -193,7 +186,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MYSQL = @MYSQL@
MYSQLCLIENT_CFLAGS = @MYSQLCLIENT_CFLAGS@
@@ -235,13 +227,11 @@ VERSION_INFO = @VERSION_INFO@
ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
-ZMQ_PREFIX = @ZMQ_PREFIX@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_aux_dir = @ac_aux_dir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -275,6 +265,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -392,7 +383,7 @@ clean-binPROGRAMS:
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
-TangoTest$(EXEEXT): $(TangoTest_OBJECTS) $(TangoTest_DEPENDENCIES) $(EXTRA_TangoTest_DEPENDENCIES)
+TangoTest$(EXEEXT): $(TangoTest_OBJECTS) $(TangoTest_DEPENDENCIES)
@rm -f TangoTest$(EXEEXT)
$(CXXLINK) $(TangoTest_OBJECTS) $(TangoTest_LDADD) $(LIBS)
@@ -451,7 +442,9 @@ uninstall-tangoincludeHEADERS:
@$(NORMAL_UNINSTALL)
@list='$(tangoinclude_HEADERS)'; test -n "$(tangoincludedir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- dir='$(DESTDIR)$(tangoincludedir)'; $(am__uninstall_files_from_dir)
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(tangoincludedir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(tangoincludedir)" && rm -f $$files
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -552,15 +545,10 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- if test -z '$(STRIP)'; then \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- install; \
- else \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
- fi
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
clean-generic:
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 30f6b78..e889f4a 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -6,7 +6,13 @@ install-data-local:
mkdir -p $(DESTDIR)/$(docdir)
for file in $(DOCS); do \
cp -f $(srcdir)/$$file $(DESTDIR)/$(docdir)/$$file; \
- done;
+ chmod u+w $(DESTDIR)/$(docdir)/$$file; \
+ done;
+
+uninstall-local:
+ for file in $(DOCS);do \
+ rm $(DESTDIR)/$(docdir)/$$file; \
+ done;
dist-hook:
for file in $(DOCS); do \
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 70ba083..a25eb9a 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -616,7 +616,7 @@ ps: ps-recursive
ps-am:
-uninstall-am:
+uninstall-am: uninstall-local
.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
install-am install-strip tags-recursive
@@ -633,14 +633,20 @@ uninstall-am:
installcheck installcheck-am installdirs installdirs-am \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags tags-recursive uninstall uninstall-am
+ tags tags-recursive uninstall uninstall-am uninstall-local
install-data-local:
mkdir -p $(DESTDIR)/$(docdir)
for file in $(DOCS); do \
cp -f $(srcdir)/$$file $(DESTDIR)/$(docdir)/$$file; \
- done;
+ chmod u+w $(DESTDIR)/$(docdir)/$$file; \
+ done;
+
+uninstall-local:
+ for file in $(DOCS);do \
+ rm $(DESTDIR)/$(docdir)/$$file; \
+ done;
dist-hook:
for file in $(DOCS); do \
diff --git a/lib/cpp/client/Makefile.in b/lib/cpp/client/Makefile.in
index 1034913..890370c 100644
--- a/lib/cpp/client/Makefile.in
+++ b/lib/cpp/client/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -114,12 +114,6 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
- test -z "$$files" \
- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && rm -f $$files; }; \
- }
am__installdirs = "$(DESTDIR)$(tangoincludedir)"
HEADERS = $(tangoinclude_HEADERS)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
@@ -179,7 +173,6 @@ CYGPATH_W = @CYGPATH_W@
DATADIR = @DATADIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DOXYGEN = @DOXYGEN@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -234,7 +227,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MYSQL = @MYSQL@
MYSQLCLIENT_CFLAGS = @MYSQLCLIENT_CFLAGS@
@@ -276,13 +268,11 @@ VERSION_INFO = @VERSION_INFO@
ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
-ZMQ_PREFIX = @ZMQ_PREFIX@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_aux_dir = @ac_aux_dir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -316,6 +306,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -437,7 +428,7 @@ clean-noinstLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
-libclient.la: $(libclient_la_OBJECTS) $(libclient_la_DEPENDENCIES) $(EXTRA_libclient_la_DEPENDENCIES)
+libclient.la: $(libclient_la_OBJECTS) $(libclient_la_DEPENDENCIES)
$(CXXLINK) $(libclient_la_OBJECTS) $(libclient_la_LIBADD) $(LIBS)
mostlyclean-compile:
@@ -519,7 +510,9 @@ uninstall-tangoincludeHEADERS:
@$(NORMAL_UNINSTALL)
@list='$(tangoinclude_HEADERS)'; test -n "$(tangoincludedir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- dir='$(DESTDIR)$(tangoincludedir)'; $(am__uninstall_files_from_dir)
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(tangoincludedir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(tangoincludedir)" && rm -f $$files
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -732,15 +725,10 @@ install-am: all-am
installcheck: installcheck-recursive
install-strip:
- if test -z '$(STRIP)'; then \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- install; \
- else \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
- fi
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
clean-generic:
diff --git a/lib/cpp/client/helpers/Makefile.in b/lib/cpp/client/helpers/Makefile.in
index bc60859..a8e4141 100644
--- a/lib/cpp/client/helpers/Makefile.in
+++ b/lib/cpp/client/helpers/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -81,12 +81,6 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
- test -z "$$files" \
- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && rm -f $$files; }; \
- }
am__installdirs = "$(DESTDIR)$(tangoincludedir)"
HEADERS = $(tangoinclude_HEADERS)
ETAGS = etags
@@ -115,7 +109,6 @@ CYGPATH_W = @CYGPATH_W@
DATADIR = @DATADIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DOXYGEN = @DOXYGEN@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -170,7 +163,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MYSQL = @MYSQL@
MYSQLCLIENT_CFLAGS = @MYSQLCLIENT_CFLAGS@
@@ -212,13 +204,11 @@ VERSION_INFO = @VERSION_INFO@
ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
-ZMQ_PREFIX = @ZMQ_PREFIX@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_aux_dir = @ac_aux_dir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -252,6 +242,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -334,7 +325,9 @@ uninstall-tangoincludeHEADERS:
@$(NORMAL_UNINSTALL)
@list='$(tangoinclude_HEADERS)'; test -n "$(tangoincludedir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- dir='$(DESTDIR)$(tangoincludedir)'; $(am__uninstall_files_from_dir)
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(tangoincludedir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(tangoincludedir)" && rm -f $$files
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -435,15 +428,10 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- if test -z '$(STRIP)'; then \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- install; \
- else \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
- fi
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
clean-generic:
diff --git a/lib/cpp/log4tango/Makefile.am b/lib/cpp/log4tango/Makefile.am
index e0231d5..cf58feb 100644
--- a/lib/cpp/log4tango/Makefile.am
+++ b/lib/cpp/log4tango/Makefile.am
@@ -1,5 +1,7 @@
SUBDIRS = config src include tests
+ACLOCAL_AMFLAGS = -I m4
+
if DOC
SUBDIRS += doc
endif
diff --git a/lib/cpp/log4tango/Makefile.in b/lib/cpp/log4tango/Makefile.in
index 19a1da5..3458fcd 100644
--- a/lib/cpp/log4tango/Makefile.in
+++ b/lib/cpp/log4tango/Makefile.in
@@ -275,6 +275,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = config src include tests $(am__append_1)
+ACLOCAL_AMFLAGS = -I m4
DIST_SUBDIRS = config src include tests $(am__append_2)
EXTRA_DIST = log4tango.pc.in \
log4tango.m4 \
diff --git a/lib/cpp/log4tango/configure b/lib/cpp/log4tango/configure
index f7539c5..f54ccd3 100644
--- a/lib/cpp/log4tango/configure
+++ b/lib/cpp/log4tango/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for log4tango 4.0.6.
+# Generated by GNU Autoconf 2.68 for log4tango 4.0.7.
#
# Report bugs to <nicolas.leclercq at synchrotron-soleil.fr>.
#
@@ -570,8 +570,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='log4tango'
PACKAGE_TARNAME='log4tango'
-PACKAGE_VERSION='4.0.6'
-PACKAGE_STRING='log4tango 4.0.6'
+PACKAGE_VERSION='4.0.7'
+PACKAGE_STRING='log4tango 4.0.7'
PACKAGE_BUGREPORT='nicolas.leclercq at synchrotron-soleil.fr'
PACKAGE_URL=''
@@ -1314,7 +1314,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures log4tango 4.0.6 to adapt to many kinds of systems.
+\`configure' configures log4tango 4.0.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1384,7 +1384,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of log4tango 4.0.6:";;
+ short | recursive ) echo "Configuration of log4tango 4.0.7:";;
esac
cat <<\_ACEOF
@@ -1494,7 +1494,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-log4tango configure 4.0.6
+log4tango configure 4.0.7
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2093,7 +2093,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by log4tango $as_me 4.0.6, which was
+It was created by log4tango $as_me 4.0.7, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2909,7 +2909,7 @@ fi
# Define the identity of the package.
PACKAGE='log4tango'
- VERSION='4.0.6'
+ VERSION='4.0.7'
cat >>confdefs.h <<_ACEOF
@@ -2984,7 +2984,7 @@ fi
# ? :+1 : ? == just some internal changes, nothing breaks but might work
# better
# CURRENT : REVISION : AGE
-LT_VERSION=4:6:0
+LT_VERSION=4:7:0
@@ -16961,7 +16961,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by log4tango $as_me 4.0.6, which was
+This file was extended by log4tango $as_me 4.0.7, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17027,7 +17027,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-log4tango config.status 4.0.6
+log4tango config.status 4.0.7
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/lib/cpp/log4tango/configure.in b/lib/cpp/log4tango/configure.in
index 99fe4f0..156ae21 100644
--- a/lib/cpp/log4tango/configure.in
+++ b/lib/cpp/log4tango/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(log4tango, 4.0.6, nicolas.leclercq at synchrotron-soleil.fr)
+AC_INIT(log4tango, 4.0.7, nicolas.leclercq at synchrotron-soleil.fr)
AC_CONFIG_AUX_DIR(config)
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE
@@ -15,7 +15,7 @@ AC_PREREQ(2.50)
# ? :+1 : ? == just some internal changes, nothing breaks but might work
# better
# CURRENT : REVISION : AGE
-LT_VERSION=4:6:0
+LT_VERSION=4:7:0
AC_SUBST(LT_VERSION)
diff --git a/lib/cpp/log4tango/doc/Doxyfile.in b/lib/cpp/log4tango/doc/Doxyfile.in
index f5c66e9..b27e523 100644
--- a/lib/cpp/log4tango/doc/Doxyfile.in
+++ b/lib/cpp/log4tango/doc/Doxyfile.in
@@ -470,7 +470,7 @@ SHOW_USED_FILES = YES
# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
# in the documentation. The default is NO.
-SHOW_DIRECTORIES = NO
+#SHOW_DIRECTORIES = NO
# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
# This will remove the Files entry from the Quick Index and from the
@@ -799,7 +799,7 @@ HTML_STYLESHEET =
# files or namespaces will be aligned in HTML using tables. If set to
# NO a bullet list will be used.
-HTML_ALIGN_MEMBERS = YES
+#HTML_ALIGN_MEMBERS = YES
# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
# documentation will contain sections that can be hidden and shown after the
diff --git a/lib/cpp/log4tango/log4tango.pc.in b/lib/cpp/log4tango/log4tango.pc.in
index 0e61e8a..c4acacb 100644
--- a/lib/cpp/log4tango/log4tango.pc.in
+++ b/lib/cpp/log4tango/log4tango.pc.in
@@ -1,10 +1,10 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
-includedir=@includedir@/tango
+includedir=@includedir@
Name: log4tango
Description: Logging library for the tango constrol system
Version: @VERSION@
Libs: -L${libdir} -llog4tango
-Cflags: -I${includedir}
+Cflags: -I${includedir}/tango
diff --git a/lib/cpp/log4tango/src/snprintf.c b/lib/cpp/log4tango/src/snprintf.c
index 49a34a8..f93b6ce 100644
--- a/lib/cpp/log4tango/src/snprintf.c
+++ b/lib/cpp/log4tango/src/snprintf.c
@@ -950,7 +950,7 @@ int portable_vsnprintf(char *str, size_t str_m, const char *fmt, va_list ap) {
/* insert padding to the left as requested by min_field_width;
this does not include the zero padding in case of numerical conversions*/
if (!justify_left) { /* left padding with blank or zero */
- int n = min_field_width - (str_arg_l+number_of_zeros_to_pad);
+ unsigned int n = min_field_width - (str_arg_l+number_of_zeros_to_pad);
if (n > 0) {
if (str_l < str_m) {
size_t avail = str_m-str_l;
@@ -967,7 +967,7 @@ int portable_vsnprintf(char *str, size_t str_m, const char *fmt, va_list ap) {
zero_padding_insertion_ind = 0;
} else {
/* insert first part of numerics (sign or '0x') before zero padding */
- int n = zero_padding_insertion_ind;
+ unsigned int n = zero_padding_insertion_ind;
if (n > 0) {
if (str_l < str_m) {
size_t avail = str_m-str_l;
@@ -987,7 +987,7 @@ int portable_vsnprintf(char *str, size_t str_m, const char *fmt, va_list ap) {
}
/* insert formatted string
* (or as-is conversion specifier for unknown conversions) */
- { int n = str_arg_l - zero_padding_insertion_ind;
+ { unsigned int n = str_arg_l - zero_padding_insertion_ind;
if (n > 0) {
if (str_l < str_m) {
size_t avail = str_m-str_l;
@@ -999,7 +999,7 @@ int portable_vsnprintf(char *str, size_t str_m, const char *fmt, va_list ap) {
}
/* insert right padding */
if (justify_left) { /* right blank padding to the field width */
- int n = min_field_width - (str_arg_l+number_of_zeros_to_pad);
+ unsigned int n = min_field_width - (str_arg_l+number_of_zeros_to_pad);
if (n > 0) {
if (str_l < str_m) {
size_t avail = str_m-str_l;
diff --git a/lib/cpp/server/Makefile.in b/lib/cpp/server/Makefile.in
index c4905fd..67f3a68 100644
--- a/lib/cpp/server/Makefile.in
+++ b/lib/cpp/server/Makefile.in
@@ -285,7 +285,6 @@ VERSION_INFO = @VERSION_INFO@
ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
-ZMQ_PREFIX = @ZMQ_PREFIX@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/lib/cpp/server/attrmanip.h b/lib/cpp/server/attrmanip.h
index 6ef7956..a0d8e7c 100644
--- a/lib/cpp/server/attrmanip.h
+++ b/lib/cpp/server/attrmanip.h
@@ -28,123 +28,7 @@
// You should have received a copy of the GNU Lesser General Public License
// along with Tango. If not, see <http://www.gnu.org/licenses/>.
//
-// $Revision: 18627 $
-//
-// $Log$
-// Revision 3.6 2010/09/09 13:44:46 taurel
-// - Add year 2010 in Copyright notice
-//
-// Revision 3.5 2009/01/21 12:49:04 taurel
-// - Change CopyRights for 2009
-//
-// Revision 3.4 2008/10/06 15:00:36 taurel
-// - Changed the licensing info from GPL to LGPL
-//
-// Revision 3.3 2008/10/03 06:51:36 taurel
-// - Add some licensing info in each files
-//
-// Revision 3.2 2005/06/29 08:30:53 taurel
-// - Last commit before release 5.2 ?
-//
-// Revision 3.1 2005/05/25 06:05:40 taurel
-// - Again some minors changes before 5.2
-//
-// Revision 3.0 2003/03/25 16:41:59 taurel
-// Many changes for Tango release 3.0 including
-// - Added full logging features
-// - Added asynchronous calls
-// - Host name of clients now stored in black-box
-// - Three serialization model in DS
-// - Fix miscellaneous bugs
-// - Ported to gcc 3.2
-// - Added ApiUtil::cleanup() and destructor methods
-// - Some internal cleanups
-// - Change the way how TangoMonitor class is implemented. It's a recursive
-// mutex
-//
-// Revision 2.10 2003/03/11 17:55:47 nleclercq
-// Switch from log4cpp to log4tango
-//
-// Revision 2.9 2003/01/09 12:03:15 taurel
-// - Ported to gcc 3.2
-// - Added ApiUtil::cleanup() and ApiUtil::~ApiUtil() methods
-// - Replace some ORB * by ORB_ptr
-// - Use CORBA::ORB::is_nil() instead of comparing to NULL
-//
-// Revision 2.8 2002/12/16 12:06:21 taurel
-// No change in code at all but only forgot th emost important line in
-// list of updates in the previous release :
-// - Change underlying ORB from ORBacus to omniORB
-//
-// Revision 2.7 2002/12/16 10:15:35 taurel
-// - New method get_device_list() in Util class
-// - Util::get_class_list takes DServer device into account
-// - Util::get_device_by_name() takes DServer device into account
-// - Util::get_device_list_by_class() takes DServer device into account
-// - New parameter to the attribute::set_value() method to enable CORBA to free
-// memory allocated for the attribute
-//
-// Revision 2.6 2002/10/17 07:43:05 taurel
-// Fix bug in history stored by the polling thread :
-// - We need one copy of the attribute data to build an history!!! It is true
-// also for command which return data created by the DeviceImpl::create_xxx
-// methods. Chnage in pollring.cpp/pollring.h/dserverpoll.cpp/pollobj.cpp
-// and pollobj.h
-//
-// Revision 2.5 2002/10/15 11:27:18 taurel
-// Fix bugs in device.cpp file :
-// - Protect the state and status CORBA attribute with the device monitor
-// Add the "TgLibVers" string as a #define in tango_config.h
-//
-// Revision 2.4 2002/08/12 15:06:53 taurel
-// Several big fixes and changes
-// - Remove HP-UX specific code
-// - Fix bug in polling alogorithm which cause the thread to enter an infinite
-// loop (pollthread.cpp)
-// - For bug for Win32 device when trying to set attribute config
-// (attribute.cpp)
-//
-// Revision 2.3 2002/07/02 15:22:23 taurel
-// Miscellaneous small changes/bug fixes for Tango CPP release 2.1.0
-// - classes reference documentation now generated using doxygen instead of doc++
-// - A little file added to the library which summarizes version number.
-// The RCS/CVS "ident" command will now tells you that release library x.y.z is composed
-// by C++ client classes set release a.b and C++ server classes set release c.d
-// - Fix incorrect field setting for DevFailed exception re-thrown from a CORBA exception
-// - It's now not possible to poll the Init command
-// - It's now possible to define a default class doc. per control system
-// instance (using property)
-// - The test done to check if attribute value has been set before it is
-// returned to caller is done only if the attribute quality is set to VALID
-// - The JTCInitialize object is now stored in the Util
-// - Windows specific : The tango.h file now also include winsock.h
-//
-// Revision 2.2 2002/04/30 10:50:40 taurel
-// Don't check alarm on attribute if attribute quality factor is INVALID
-//
-// Revision 2.1 2002/04/29 12:24:02 taurel
-// Fix bug in attribute::set_value method and on the check against min and max value when writing attributes
-//
-// Revision 2.0 2002/04/09 14:45:08 taurel
-// See Tango WEB pages for list of changes
-//
-// Revision 1.6 2001/10/08 09:03:10 taurel
-// See tango WEB pages for list of changes
-//
-// Revision 1.5 2001/07/04 12:27:09 taurel
-// New methods re_throw_exception(). Read_attributes supports AllAttr mnemonic A new add_attribute()method in DeviceImpl class New way to define attribute properties New pattern to prevent full re-compile For multi-classes DS, it is now possible to use the Util::get_device_by_name() method in device constructor Adding << operator ovebloading Fix devie CORBA ref. number when device constructor sends an excep.
-//
-// Revision 1.4 2001/05/04 09:28:12 taurel
-// Fix bugs in DServer::restart() method and in Util::get_device_by_name() method
-//
-// Revision 1.3 2001/03/30 08:03:44 taurel
-// Fix bugs in attributes. For linux, add signal_handler in its own thread, change the way to kill server. For all system, change DevRestart philosophy.
-//
-// Revision 1.2 2001/03/09 08:20:14 taurel
-// Fix bug in the MultiClassAttribute::init_class_attribute() method. Also remove the DbErr_DeviceNotDefined define.
-//
-// Revision 1.1.1.1 2001/02/27 08:46:21 taurel
-// Imported sources
+// $Revision: 20402 $
//
//=============================================================================
diff --git a/lib/cpp/server/basiccommand.cpp b/lib/cpp/server/basiccommand.cpp
index 2ea9ce1..91e9e67 100644
--- a/lib/cpp/server/basiccommand.cpp
+++ b/lib/cpp/server/basiccommand.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: basiccommand.cpp 19138 2012-01-31 16:55:49Z taurel $\n$Name$";
+static const char *RcsId = "$Id: basiccommand.cpp 20402 2012-05-29 14:26:53Z taurel $\n$Name$";
//+============================================================================
//
@@ -33,193 +33,7 @@ static const char *RcsId = "$Id: basiccommand.cpp 19138 2012-01-31 16:55:49Z tau
// You should have received a copy of the GNU Lesser General Public License
// along with Tango. If not, see <http://www.gnu.org/licenses/>.
//
-// $Revision: 19138 $
-//
-// $Log$
-// Revision 3.16 2010/09/09 13:44:46 taurel
-// - Add year 2010 in Copyright notice
-//
-// Revision 3.15 2009/03/13 09:33:29 taurel
-// - Small changes to fix Windows VC8 warnings in Warning level 3
-//
-// Revision 3.14 2009/02/03 15:10:07 jensmeyer
-// Added cleaning of the sub device list in DevInitCmd::execute().
-//
-// Revision 3.13 2009/01/21 12:49:04 taurel
-// - Change CopyRights for 2009
-//
-// Revision 3.12 2008/10/06 15:00:36 taurel
-// - Changed the licensing info from GPL to LGPL
-//
-// Revision 3.11 2008/10/03 06:51:36 taurel
-// - Add some licensing info in each files
-//
-// Revision 3.10 2008/09/04 07:37:05 taurel
-// - Fix bug in memorized attributes
-// - Changes for the new IDL 4
-//
-// Revision 3.9 2008/05/20 12:44:09 taurel
-// - Commit after merge with release 7 branch
-//
-// Revision 3.8 2008/02/29 12:50:27 taurel
-// - Fix bug in Init command for the admin device
-// Revision 3.7.2.1 2008/02/07 15:58:12 taurel
-// - First implementation of the Controlled Access done
-//
-// Revision 3.7 2007/11/08 12:03:44 taurel
-// - Start implementing user interceptors
-// - Fix bug in poll thread pproperty management when removing polling object
-// - Set a database timeout to 6 sec
-//
-// Revision 3.6 2007/10/26 11:25:25 taurel
-// - Memorized attributes now applied even for the Init command
-//
-// Revision 3.5 2006/11/20 16:28:43 taurel
-// - Re-configure the polling thread if the Init command is done on the admin
-// device
-//
-// Revision 3.4 2006/05/18 08:52:37 taurel
-// - Miscellaneous changes due to Python device server ported to Windows
-// - Fix some bugs discovered by Windows VC8 using the test suite
-// - Update Windows resource file include path
-// - Fix some Windows VC8 warnings
-//
-// Revision 3.3 2005/01/13 09:27:52 taurel
-// Fix some bugs :
-// - R/W attribute : W value not returned when read if set by set_write_value
-// - Core dumped when retrieving attribute polling history for Device_2Impl device which
-// has stored an exception
-// - Remove device_name in lib default attribute label property
-// - Lib default value for label not store in db any more
-// - Size of the DaData used by the Database::get_device_attribute_property() and
-// Database::get_class_attribute_property()
-// - R/W attribute: W part not returned when read for Device_2Impl device
-// Some changes :
-// - Improvement of the -file option error management (now throw exception in case of
-// error)
-// - Reset "string" attribute property to the default value (lib or user) when new
-// value is an empty string
-//
-// Revision 3.2 2003/05/28 14:55:07 taurel
-// Add the include (conditionally) of the include files generated by autoconf
-//
-// Revision 3.1 2003/05/16 08:46:15 taurel
-// Many changes for release 3.0.1. The most important ones are :
-// - Timeout are backs
-// - Multiple db servers (change in TANGO_HOST syntax)
-// - Added methods to print DeviceData, DeviceDataHistory, DeviceAttribute and DeviceAttributeHistory instances
-// - Attributes name stored in blackbox
-// - Remove check if a class is created without any device
-// - It's now possible to create a DeviceProxy from its alias name
-// - Command, attribute names are case insensitive
-// - Change parameters of some DeviceProxy logging methods
-// - Change parameters of DeviceProxy asynchronous replies calls
-// - New serialization model in device server (no serialization model)
-// - Win32 (2000) device server service does not exit at loggoff anymore
-// - Miscellaneous bug fixes
-//
-// Revision 3.0 2003/03/25 16:41:57 taurel
-// Many changes for Tango release 3.0 including
-// - Added full logging features
-// - Added asynchronous calls
-// - Host name of clients now stored in black-box
-// - Three serialization model in DS
-// - Fix miscellaneous bugs
-// - Ported to gcc 3.2
-// - Added ApiUtil::cleanup() and destructor methods
-// - Some internal cleanups
-// - Change the way how TangoMonitor class is implemented. It's a recursive
-// mutex
-//
-// Revision 2.9 2003/01/09 12:03:15 taurel
-// - Ported to gcc 3.2
-// - Added ApiUtil::cleanup() and ApiUtil::~ApiUtil() methods
-// - Replace some ORB * by ORB_ptr
-// - Use CORBA::ORB::is_nil() instead of comparing to NULL
-//
-// Revision 2.8 2002/12/16 12:06:21 taurel
-// No change in code at all but only forgot th emost important line in
-// list of updates in the previous release :
-// - Change underlying ORB from ORBacus to omniORB
-//
-// Revision 2.7 2002/12/16 10:15:35 taurel
-// - New method get_device_list() in Util class
-// - Util::get_class_list takes DServer device into account
-// - Util::get_device_by_name() takes DServer device into account
-// - Util::get_device_list_by_class() takes DServer device into account
-// - New parameter to the attribute::set_value() method to enable CORBA to free
-// memory allocated for the attribute
-//
-// Revision 2.6 2002/10/17 07:43:05 taurel
-// Fix bug in history stored by the polling thread :
-// - We need one copy of the attribute data to build an history!!! It is true
-// also for command which return data created by the DeviceImpl::create_xxx
-// methods. Chnage in pollring.cpp/pollring.h/dserverpoll.cpp/pollobj.cpp
-// and pollobj.h
-//
-// Revision 2.5 2002/10/15 11:27:18 taurel
-// Fix bugs in device.cpp file :
-// - Protect the state and status CORBA attribute with the device monitor
-// Add the "TgLibVers" string as a #define in tango_config.h
-//
-// Revision 2.4 2002/08/12 15:06:53 taurel
-// Several big fixes and changes
-// - Remove HP-UX specific code
-// - Fix bug in polling alogorithm which cause the thread to enter an infinite
-// loop (pollthread.cpp)
-// - For bug for Win32 device when trying to set attribute config
-// (attribute.cpp)
-//
-// Revision 2.3 2002/07/02 15:22:23 taurel
-// Miscellaneous small changes/bug fixes for Tango CPP release 2.1.0
-// - classes reference documentation now generated using doxygen instead of doc++
-// - A little file added to the library which summarizes version number.
-// The RCS/CVS "ident" command will now tells you that release library x.y.z is composed
-// by C++ client classes set release a.b and C++ server classes set release c.d
-// - Fix incorrect field setting for DevFailed exception re-thrown from a CORBA exception
-// - It's now not possible to poll the Init command
-// - It's now possible to define a default class doc. per control system
-// instance (using property)
-// - The test done to check if attribute value has been set before it is
-// returned to caller is done only if the attribute quality is set to VALID
-// - The JTCInitialize object is now stored in the Util
-// - Windows specific : The tango.h file now also include winsock.h
-//
-// Revision 2.2 2002/04/30 10:50:40 taurel
-// Don't check alarm on attribute if attribute quality factor is INVALID
-//
-// Revision 2.1 2002/04/29 12:24:02 taurel
-// Fix bug in attribute::set_value method and on the check against min and max value when writing attributes
-//
-// Revision 2.0 2002/04/09 14:45:08 taurel
-// See Tango WEB pages for list of changes
-//
-// Revision 1.6 2001/10/08 09:03:10 taurel
-// See tango WEB pages for list of changes
-//
-// Revision 1.5 2001/07/04 12:27:09 taurel
-// New methods re_throw_exception(). Read_attributes supports AllAttr mnemonic A new add_attribute()method in DeviceImpl class New way to define attribute properties New pattern to prevent full re-compile For multi-classes DS, it is now possible to use the Util::get_device_by_name() method in device constructor Adding << operator ovebloading Fix devie CORBA ref. number when device constructor sends an excep.
-//
-// Revision 1.4 2001/05/04 09:28:12 taurel
-// Fix bugs in DServer::restart() method and in Util::get_device_by_name() method
-//
-// Revision 1.3 2001/03/30 08:03:44 taurel
-// Fix bugs in attributes. For linux, add signal_handler in its own thread, change the way to kill server. For all system, change DevRestart philosophy.
-//
-// Revision 1.2 2001/03/09 08:20:14 taurel
-// Fix bug in the MultiClassAttribute::init_class_attribute() method. Also remove the DbErr_DeviceNotDefined define.
-//
-// Revision 1.1.1.1 2001/02/27 08:46:20 taurel
-// Imported sources
-//
-// Revision 1.3 2000/04/13 10:40:39 taurel
-// Added attribute support
-//
-// Revision 1.2 2000/02/04 11:00:12 taurel
-// Just update revision number
-//
-// Revision 1.1.1.1 2000/02/04 10:58:27 taurel
-// Imported sources
+// $Revision: 20402 $
//
//-============================================================================
diff --git a/lib/cpp/server/basiccommand.h b/lib/cpp/server/basiccommand.h
index 4ec9996..d13efb8 100644
--- a/lib/cpp/server/basiccommand.h
+++ b/lib/cpp/server/basiccommand.h
@@ -32,117 +32,7 @@
// You should have received a copy of the GNU Lesser General Public License
// along with Tango. If not, see <http://www.gnu.org/licenses/>.
//
-// $Revision: 18627 $
-//
-// $Log$
-// Revision 3.4 2010/09/09 13:44:46 taurel
-// - Add year 2010 in Copyright notice
-//
-// Revision 3.3 2009/01/21 12:49:04 taurel
-// - Change CopyRights for 2009
-//
-// Revision 3.2 2008/10/06 15:00:36 taurel
-// - Changed the licensing info from GPL to LGPL
-//
-// Revision 3.1 2008/10/03 06:51:36 taurel
-// - Add some licensing info in each files
-//
-// Revision 3.0 2003/03/25 16:41:50 taurel
-// Many changes for Tango release 3.0 including
-// - Added full logging features
-// - Added asynchronous calls
-// - Host name of clients now stored in black-box
-// - Three serialization model in DS
-// - Fix miscellaneous bugs
-// - Ported to gcc 3.2
-// - Added ApiUtil::cleanup() and destructor methods
-// - Some internal cleanups
-// - Change the way how TangoMonitor class is implemented. It's a recursive
-// mutex
-//
-// Revision 2.8 2002/12/16 12:06:21 taurel
-// No change in code at all but only forgot th emost important line in
-// list of updates in the previous release :
-// - Change underlying ORB from ORBacus to omniORB
-//
-// Revision 2.7 2002/12/16 10:15:35 taurel
-// - New method get_device_list() in Util class
-// - Util::get_class_list takes DServer device into account
-// - Util::get_device_by_name() takes DServer device into account
-// - Util::get_device_list_by_class() takes DServer device into account
-// - New parameter to the attribute::set_value() method to enable CORBA to free
-// memory allocated for the attribute
-//
-// Revision 2.6 2002/10/17 07:43:05 taurel
-// Fix bug in history stored by the polling thread :
-// - We need one copy of the attribute data to build an history!!! It is true
-// also for command which return data created by the DeviceImpl::create_xxx
-// methods. Chnage in pollring.cpp/pollring.h/dserverpoll.cpp/pollobj.cpp
-// and pollobj.h
-//
-// Revision 2.5 2002/10/15 11:27:18 taurel
-// Fix bugs in device.cpp file :
-// - Protect the state and status CORBA attribute with the device monitor
-// Add the "TgLibVers" string as a #define in tango_config.h
-//
-// Revision 2.4 2002/08/12 15:06:53 taurel
-// Several big fixes and changes
-// - Remove HP-UX specific code
-// - Fix bug in polling alogorithm which cause the thread to enter an infinite
-// loop (pollthread.cpp)
-// - For bug for Win32 device when trying to set attribute config
-// (attribute.cpp)
-//
-// Revision 2.3 2002/07/02 15:22:23 taurel
-// Miscellaneous small changes/bug fixes for Tango CPP release 2.1.0
-// - classes reference documentation now generated using doxygen instead of doc++
-// - A little file added to the library which summarizes version number.
-// The RCS/CVS "ident" command will now tells you that release library x.y.z is composed
-// by C++ client classes set release a.b and C++ server classes set release c.d
-// - Fix incorrect field setting for DevFailed exception re-thrown from a CORBA exception
-// - It's now not possible to poll the Init command
-// - It's now possible to define a default class doc. per control system
-// instance (using property)
-// - The test done to check if attribute value has been set before it is
-// returned to caller is done only if the attribute quality is set to VALID
-// - The JTCInitialize object is now stored in the Util
-// - Windows specific : The tango.h file now also include winsock.h
-//
-// Revision 2.2 2002/04/30 10:50:40 taurel
-// Don't check alarm on attribute if attribute quality factor is INVALID
-//
-// Revision 2.1 2002/04/29 12:24:02 taurel
-// Fix bug in attribute::set_value method and on the check against min and max value when writing attributes
-//
-// Revision 2.0 2002/04/09 14:45:08 taurel
-// See Tango WEB pages for list of changes
-//
-// Revision 1.6 2001/10/08 09:03:10 taurel
-// See tango WEB pages for list of changes
-//
-// Revision 1.5 2001/07/04 12:27:09 taurel
-// New methods re_throw_exception(). Read_attributes supports AllAttr mnemonic A new add_attribute()method in DeviceImpl class New way to define attribute properties New pattern to prevent full re-compile For multi-classes DS, it is now possible to use the Util::get_device_by_name() method in device constructor Adding << operator ovebloading Fix devie CORBA ref. number when device constructor sends an excep.
-//
-// Revision 1.4 2001/05/04 09:28:12 taurel
-// Fix bugs in DServer::restart() method and in Util::get_device_by_name() method
-//
-// Revision 1.3 2001/03/30 08:03:44 taurel
-// Fix bugs in attributes. For linux, add signal_handler in its own thread, change the way to kill server. For all system, change DevRestart philosophy.
-//
-// Revision 1.2 2001/03/09 08:20:14 taurel
-// Fix bug in the MultiClassAttribute::init_class_attribute() method. Also remove the DbErr_DeviceNotDefined define.
-//
-// Revision 1.1.1.1 2001/02/27 08:46:20 taurel
-// Imported sources
-//
-// Revision 1.3 2000/04/13 10:40:39 taurel
-// Added attribute support
-//
-// Revision 1.2 2000/02/04 11:00:12 taurel
-// Just update revision number
-//
-// Revision 1.1.1.1 2000/02/04 10:58:28 taurel
-// Imported sources
+// $Revision: 20402 $
//
//=============================================================================
diff --git a/lib/cpp/server/dserverclass.h b/lib/cpp/server/dserverclass.h
index 587a0c1..fe0d5e2 100644
--- a/lib/cpp/server/dserverclass.h
+++ b/lib/cpp/server/dserverclass.h
@@ -35,166 +35,7 @@
// You should have received a copy of the GNU Lesser General Public License
// along with Tango. If not, see <http://www.gnu.org/licenses/>.
//
-// $Revision: 18627 $
-//
-// $Log$
-// Revision 3.9 2010/09/09 13:45:22 taurel
-// - Add year 2010 in Copyright notice
-//
-// Revision 3.8 2009/02/03 15:15:08 jensmeyer
-// Added a QuerySubDevice command to read the list of opened sub device
-// connections.
-//
-// Revision 3.7 2009/01/21 12:49:04 taurel
-// - Change CopyRights for 2009
-//
-// Revision 3.6 2008/10/06 15:01:09 taurel
-// - Changed the licensing info from GPL to LGPL
-//
-// Revision 3.5 2008/10/03 06:52:31 taurel
-// - Add some licensing info in each files
-//
-// Revision 3.4 2008/05/20 12:44:11 taurel
-// - Commit after merge with release 7 branch
-//
-// Revision 3.3.2.3 2008/01/03 16:05:52 taurel
-// - Some changes in locking feature implementation
-//
-// Revision 3.3.2.2 2007/12/19 15:54:47 taurel
-// - Still some work going on for the locking feature
-//
-// Revision 3.3.2.1 2007/11/22 12:33:11 taurel
-// - First part of the device locking implementation
-//
-// Revision 3.3 2005/03/14 09:49:29 taurel
-// - Fix some bugs in filedatabase (Change in the data transferred between client and
-// server).
-// - Fix bug in event re-connection
-// - Add event support even for device server started with the -file command line option
-//
-// Revision 3.2 2005/01/13 08:29:05 taurel
-// - Merge trunk with Release_5_0 from brach Release_5_branch
-//
-// Revision 3.1.2.1 2004/10/22 11:25:50 taurel
-// Added warning alarm
-// Change attribute config. It now includes alarm and event parameters
-// Array attribute property now supported
-// subscribe_event throws exception for change event if they are not correctly configured
-// Change in the polling thread: The event heartbeat has its own work in the work list
-// Also add some event_unregister
-// Fix order in which classes are destructed
-// Fix bug in asynchronous mode (PUSH_CALLBACK). The callback thread ate all the CPU
-// Change in the CORBA info call for the device type
-//
-// Revision 3.1 2004/07/07 08:40:11 taurel
-//
-// - Fisrt commit after merge between Trunk and release 4 branch
-// - Add EventData copy ctor, asiignement operator and dtor
-// - Add Database and DeviceProxy::get_alias() method
-// - Add AttributeProxy ctor from "device_alias/attribute_name"
-// - Exception thrown when subscribing two times for exactly yhe same event
-//
-// Revision 3.0.4.1 2004/04/07 11:22:10 taurel
-// - Add some import/export declaration for Windows DLL
-// - Add test on minor code for the CORBA::IMP_LIMIT exception before
-// printing it
-//
-// Revision 3.0 2003/03/25 16:43:16 taurel
-// Many changes for Tango release 3.0 including
-// - Added full logging features
-// - Added asynchronous calls
-// - Host name of clients now stored in black-box
-// - Three serialization model in DS
-// - Fix miscellaneous bugs
-// - Ported to gcc 3.2
-// - Added ApiUtil::cleanup() and destructor methods
-// - Some internal cleanups
-// - Change the way how TangoMonitor class is implemented. It's a recursive
-// mutex
-//
-// Revision 2.8 2002/12/16 12:07:19 taurel
-// No change in code at all but only forgot th emost important line in
-// list of updates in the previous release :
-// - Change underlying ORB from ORBacus to omniORB
-//
-// Revision 2.7 2002/12/16 10:16:21 taurel
-// - New method get_device_list() in Util class
-// - Util::get_class_list takes DServer device into account
-// - Util::get_device_by_name() takes DServer device into account
-// - Util::get_device_list_by_class() takes DServer device into account
-// - New parameter to the attribute::set_value() method to enable CORBA to free
-// memory allocated for the attribute
-//
-// Revision 2.6 2002/10/17 07:43:06 taurel
-// Fix bug in history stored by the polling thread :
-// - We need one copy of the attribute data to build an history!!! It is true
-// also for command which return data created by the DeviceImpl::create_xxx
-// methods. Chnage in pollring.cpp/pollring.h/dserverpoll.cpp/pollobj.cpp
-// and pollobj.h
-//
-// Revision 2.5 2002/10/15 11:27:19 taurel
-// Fix bugs in device.cpp file :
-// - Protect the state and status CORBA attribute with the device monitor
-// Add the "TgLibVers" string as a #define in tango_config.h
-//
-// Revision 2.4 2002/08/12 15:06:54 taurel
-// Several big fixes and changes
-// - Remove HP-UX specific code
-// - Fix bug in polling alogorithm which cause the thread to enter an infinite
-// loop (pollthread.cpp)
-// - For bug for Win32 device when trying to set attribute config
-// (attribute.cpp)
-//
-// Revision 2.3 2002/07/02 15:22:24 taurel
-// Miscellaneous small changes/bug fixes for Tango CPP release 2.1.0
-// - classes reference documentation now generated using doxygen instead of doc++
-// - A little file added to the library which summarizes version number.
-// The RCS/CVS "ident" command will now tells you that release library x.y.z is composed
-// by C++ client classes set release a.b and C++ server classes set release c.d
-// - Fix incorrect field setting for DevFailed exception re-thrown from a CORBA exception
-// - It's now not possible to poll the Init command
-// - It's now possible to define a default class doc. per control system
-// instance (using property)
-// - The test done to check if attribute value has been set before it is
-// returned to caller is done only if the attribute quality is set to VALID
-// - The JTCInitialize object is now stored in the Util
-// - Windows specific : The tango.h file now also include winsock.h
-//
-// Revision 2.2 2002/04/30 10:50:41 taurel
-// Don't check alarm on attribute if attribute quality factor is INVALID
-//
-// Revision 2.1 2002/04/29 12:24:03 taurel
-// Fix bug in attribute::set_value method and on the check against min and max value when writing attributes
-//
-// Revision 2.0 2002/04/09 14:45:10 taurel
-// See Tango WEB pages for list of changes
-//
-// Revision 1.6 2001/10/08 09:03:13 taurel
-// See tango WEB pages for list of changes
-//
-// Revision 1.5 2001/07/04 12:27:10 taurel
-// New methods re_throw_exception(). Read_attributes supports AllAttr mnemonic A new add_attribute()method in DeviceImpl class New way to define attribute properties New pattern to prevent full re-compile For multi-classes DS, it is now possible to use the Util::get_device_by_name() method in device constructor Adding << operator ovebloading Fix devie CORBA ref. number when device constructor sends an excep.
-//
-// Revision 1.4 2001/05/04 09:28:13 taurel
-// Fix bugs in DServer::restart() method and in Util::get_device_by_name() method
-//
-// Revision 1.3 2001/03/30 08:03:45 taurel
-// Fix bugs in attributes. For linux, add signal_handler in its own thread, change the way to kill server. For all system, change DevRestart philosophy.
-//
-// Revision 1.2 2001/03/09 08:20:16 taurel
-// Fix bug in the MultiClassAttribute::init_class_attribute() method. Also remove the DbErr_DeviceNotDefined define.
-//
-// Revision 1.1.1.1 2001/02/27 08:46:20 taurel
-// Imported sources
-//
-// Revision 1.3 2000/04/13 10:40:41 taurel
-// Added attribute support
-//
-// Revision 1.2 2000/02/04 11:00:14 taurel
-// Just update revision number
-//
-// Revision 1.1.1.1 2000/02/04 10:58:28 taurel
-// Imported sources
+// $Revision: 20402 $
//
//=============================================================================
diff --git a/lib/cpp/server/idl/Makefile.in b/lib/cpp/server/idl/Makefile.in
index 6800691..a43c49a 100644
--- a/lib/cpp/server/idl/Makefile.in
+++ b/lib/cpp/server/idl/Makefile.in
@@ -212,7 +212,6 @@ VERSION_INFO = @VERSION_INFO@
ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
-ZMQ_PREFIX = @ZMQ_PREFIX@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/lib/cpp/server/jpeg/Makefile.in b/lib/cpp/server/jpeg/Makefile.in
index 24fbbe9..1410896 100644
--- a/lib/cpp/server/jpeg/Makefile.in
+++ b/lib/cpp/server/jpeg/Makefile.in
@@ -209,7 +209,6 @@ VERSION_INFO = @VERSION_INFO@
ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
-ZMQ_PREFIX = @ZMQ_PREFIX@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/lib/cpp/server/jpeg_mmx/Makefile.in b/lib/cpp/server/jpeg_mmx/Makefile.in
index b74e3ac..7753577 100644
--- a/lib/cpp/server/jpeg_mmx/Makefile.in
+++ b/lib/cpp/server/jpeg_mmx/Makefile.in
@@ -204,7 +204,6 @@ VERSION_INFO = @VERSION_INFO@
ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
-ZMQ_PREFIX = @ZMQ_PREFIX@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/lib/cpp/server/pollcmds.cpp b/lib/cpp/server/pollcmds.cpp
index 1fa3860..2711614 100644
--- a/lib/cpp/server/pollcmds.cpp
+++ b/lib/cpp/server/pollcmds.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: pollcmds.cpp 18627 2011-12-12 13:19:55Z taurel $\n$Name$";
+static const char *RcsId = "$Id: pollcmds.cpp 20402 2012-05-29 14:26:53Z taurel $\n$Name$";
//+=============================================================================
//
@@ -34,100 +34,7 @@ static const char *RcsId = "$Id: pollcmds.cpp 18627 2011-12-12 13:19:55Z taurel
// You should have received a copy of the GNU Lesser General Public License
// along with Tango. If not, see <http://www.gnu.org/licenses/>.
//
-// $Revision: 18627 $
-//
-// $Log$
-// Revision 3.5 2010/09/09 13:46:00 taurel
-// - Add year 2010 in Copyright notice
-//
-// Revision 3.4 2009/01/21 12:47:15 taurel
-// - Change CopyRights for 2009
-//
-// Revision 3.3 2008/10/06 15:01:36 taurel
-// - Changed the licensing info from GPL to LGPL
-//
-// Revision 3.2 2008/10/03 06:52:31 taurel
-// - Add some licensing info in each files
-//
-// Revision 3.1 2003/05/28 14:55:10 taurel
-// Add the include (conditionally) of the include files generated by autoconf
-//
-// Revision 3.0 2003/03/25 16:44:10 taurel
-// Many changes for Tango release 3.0 including
-// - Added full logging features
-// - Added asynchronous calls
-// - Host name of clients now stored in black-box
-// - Three serialization model in DS
-// - Fix miscellaneous bugs
-// - Ported to gcc 3.2
-// - Added ApiUtil::cleanup() and destructor methods
-// - Some internal cleanups
-// - Change the way how TangoMonitor class is implemented. It's a recursive
-// mutex
-//
-// Revision 2.9 2003/01/09 12:03:16 taurel
-// - Ported to gcc 3.2
-// - Added ApiUtil::cleanup() and ApiUtil::~ApiUtil() methods
-// - Replace some ORB * by ORB_ptr
-// - Use CORBA::ORB::is_nil() instead of comparing to NULL
-//
-// Revision 2.8 2002/12/16 12:07:33 taurel
-// No change in code at all but only forgot th emost important line in
-// list of updates in the previous release :
-// - Change underlying ORB from ORBacus to omniORB
-//
-// Revision 2.7 2002/12/16 10:16:22 taurel
-// - New method get_device_list() in Util class
-// - Util::get_class_list takes DServer device into account
-// - Util::get_device_by_name() takes DServer device into account
-// - Util::get_device_list_by_class() takes DServer device into account
-// - New parameter to the attribute::set_value() method to enable CORBA to free
-// memory allocated for the attribute
-//
-// Revision 2.6 2002/10/17 07:43:07 taurel
-// Fix bug in history stored by the polling thread :
-// - We need one copy of the attribute data to build an history!!! It is true
-// also for command which return data created by the DeviceImpl::create_xxx
-// methods. Chnage in pollring.cpp/pollring.h/dserverpoll.cpp/pollobj.cpp
-// and pollobj.h
-//
-// Revision 2.5 2002/10/15 11:27:20 taurel
-// Fix bugs in device.cpp file :
-// - Protect the state and status CORBA attribute with the device monitor
-// Add the "TgLibVers" string as a #define in tango_config.h
-//
-// Revision 2.4 2002/08/12 15:06:55 taurel
-// Several big fixes and changes
-// - Remove HP-UX specific code
-// - Fix bug in polling alogorithm which cause the thread to enter an infinite
-// loop (pollthread.cpp)
-// - For bug for Win32 device when trying to set attribute config
-// (attribute.cpp)
-//
-// Revision 2.3 2002/07/02 15:22:25 taurel
-// Miscellaneous small changes/bug fixes for Tango CPP release 2.1.0
-// - classes reference documentation now generated using doxygen instead of doc++
-// - A little file added to the library which summarizes version number.
-// The RCS/CVS "ident" command will now tells you that release library x.y.z is composed
-// by C++ client classes set release a.b and C++ server classes set release c.d
-// - Fix incorrect field setting for DevFailed exception re-thrown from a CORBA exception
-// - It's now not possible to poll the Init command
-// - It's now possible to define a default class doc. per control system
-// instance (using property)
-// - The test done to check if attribute value has been set before it is
-// returned to caller is done only if the attribute quality is set to VALID
-// - The JTCInitialize object is now stored in the Util
-// - Windows specific : The tango.h file now also include winsock.h
-//
-// Revision 2.2 2002/04/30 10:50:41 taurel
-// Don't check alarm on attribute if attribute quality factor is INVALID
-//
-// Revision 2.1 2002/04/29 12:24:04 taurel
-// Fix bug in attribute::set_value method and on the check against min and max value when writing attributes
-//
-// Revision 2.0 2002/04/09 14:45:11 taurel
-// See Tango WEB pages for list of changes
-//
+// $Revision: 20402 $
//
//-=============================================================================
diff --git a/lib/cpp/server/pollcmds.h b/lib/cpp/server/pollcmds.h
index e5647b3..5385e0c 100644
--- a/lib/cpp/server/pollcmds.h
+++ b/lib/cpp/server/pollcmds.h
@@ -35,90 +35,7 @@
// You should have received a copy of the GNU Lesser General Public License
// along with Tango. If not, see <http://www.gnu.org/licenses/>.
//
-// $Revision: 18627 $
-//
-// $Log$
-// Revision 3.4 2010/09/09 13:46:00 taurel
-// - Add year 2010 in Copyright notice
-//
-// Revision 3.3 2009/01/21 12:47:15 taurel
-// - Change CopyRights for 2009
-//
-// Revision 3.2 2008/10/06 15:01:36 taurel
-// - Changed the licensing info from GPL to LGPL
-//
-// Revision 3.1 2008/10/03 06:52:31 taurel
-// - Add some licensing info in each files
-//
-// Revision 3.0 2003/03/25 16:44:11 taurel
-// Many changes for Tango release 3.0 including
-// - Added full logging features
-// - Added asynchronous calls
-// - Host name of clients now stored in black-box
-// - Three serialization model in DS
-// - Fix miscellaneous bugs
-// - Ported to gcc 3.2
-// - Added ApiUtil::cleanup() and destructor methods
-// - Some internal cleanups
-// - Change the way how TangoMonitor class is implemented. It's a recursive
-// mutex
-//
-// Revision 2.8 2002/12/16 12:07:33 taurel
-// No change in code at all but only forgot th emost important line in
-// list of updates in the previous release :
-// - Change underlying ORB from ORBacus to omniORB
-//
-// Revision 2.7 2002/12/16 10:16:23 taurel
-// - New method get_device_list() in Util class
-// - Util::get_class_list takes DServer device into account
-// - Util::get_device_by_name() takes DServer device into account
-// - Util::get_device_list_by_class() takes DServer device into account
-// - New parameter to the attribute::set_value() method to enable CORBA to free
-// memory allocated for the attribute
-//
-// Revision 2.6 2002/10/17 07:43:07 taurel
-// Fix bug in history stored by the polling thread :
-// - We need one copy of the attribute data to build an history!!! It is true
-// also for command which return data created by the DeviceImpl::create_xxx
-// methods. Chnage in pollring.cpp/pollring.h/dserverpoll.cpp/pollobj.cpp
-// and pollobj.h
-//
-// Revision 2.5 2002/10/15 11:27:20 taurel
-// Fix bugs in device.cpp file :
-// - Protect the state and status CORBA attribute with the device monitor
-// Add the "TgLibVers" string as a #define in tango_config.h
-//
-// Revision 2.4 2002/08/12 15:06:55 taurel
-// Several big fixes and changes
-// - Remove HP-UX specific code
-// - Fix bug in polling alogorithm which cause the thread to enter an infinite
-// loop (pollthread.cpp)
-// - For bug for Win32 device when trying to set attribute config
-// (attribute.cpp)
-//
-// Revision 2.3 2002/07/02 15:22:25 taurel
-// Miscellaneous small changes/bug fixes for Tango CPP release 2.1.0
-// - classes reference documentation now generated using doxygen instead of doc++
-// - A little file added to the library which summarizes version number.
-// The RCS/CVS "ident" command will now tells you that release library x.y.z is composed
-// by C++ client classes set release a.b and C++ server classes set release c.d
-// - Fix incorrect field setting for DevFailed exception re-thrown from a CORBA exception
-// - It's now not possible to poll the Init command
-// - It's now possible to define a default class doc. per control system
-// instance (using property)
-// - The test done to check if attribute value has been set before it is
-// returned to caller is done only if the attribute quality is set to VALID
-// - The JTCInitialize object is now stored in the Util
-// - Windows specific : The tango.h file now also include winsock.h
-//
-// Revision 2.2 2002/04/30 10:50:42 taurel
-// Don't check alarm on attribute if attribute quality factor is INVALID
-//
-// Revision 2.1 2002/04/29 12:24:04 taurel
-// Fix bug in attribute::set_value method and on the check against min and max value when writing attributes
-//
-// Revision 2.0 2002/04/09 14:45:11 taurel
-// See Tango WEB pages for list of changes
+// $Revision: 20402 $
//
//
//=============================================================================
diff --git a/lib/cpp/server/pollobj.cpp b/lib/cpp/server/pollobj.cpp
index ff17b25..f5349ea 100644
--- a/lib/cpp/server/pollobj.cpp
+++ b/lib/cpp/server/pollobj.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: pollobj.cpp 18627 2011-12-12 13:19:55Z taurel $\n$Name$";
+static const char *RcsId = "$Id: pollobj.cpp 20402 2012-05-29 14:26:53Z taurel $\n$Name$";
//+============================================================================
//
@@ -33,179 +33,7 @@ static const char *RcsId = "$Id: pollobj.cpp 18627 2011-12-12 13:19:55Z taurel $
// You should have received a copy of the GNU Lesser General Public License
// along with Tango. If not, see <http://www.gnu.org/licenses/>.
//
-// $Revision: 18627 $
-//
-// $Log$
-// Revision 3.17 2010/09/09 13:46:00 taurel
-// - Add year 2010 in Copyright notice
-//
-// Revision 3.16 2010/06/21 14:01:15 taurel
-// - Yet another merge with the Release_7_1_1-bugfixes branch
-//
-// Revision 3.15 2010/06/18 07:45:47 taurel
-// - In case of locked device, polling and logging related commands are
-// allowed only for the locker process
-// Revision 3.14.2.1 2010/06/21 13:26:28 taurel
-// - Fix possible deadlock due to attribute mutex management.
-// This is a SourceForge bug
-//
-// Revision 3.14 2009/09/18 09:18:06 taurel
-// - End of attribute serialization implementation?
-//
-// Revision 3.13 2009/02/27 13:26:46 taurel
-// - Small changes for Solaris
-//
-// Revision 3.12 2009/01/21 12:47:15 taurel
-// - Change CopyRights for 2009
-//
-// Revision 3.11 2008/12/19 14:27:08 taurel
-// - First changes for compatibility between IDL 3 and IDL 4
-//
-// Revision 3.10 2008/10/06 15:01:36 taurel
-// - Changed the licensing info from GPL to LGPL
-//
-// Revision 3.9 2008/10/03 06:52:31 taurel
-// - Add some licensing info in each files
-//
-// Revision 3.8 2008/07/03 11:29:27 taurel
-// - Clean-up memory allocation in set_value() methods
-// - Continue Device_4 implementation in fire_xxx event methods
-//
-// Revision 3.7 2008/05/20 12:44:12 taurel
-// - Commit after merge with release 7 branch
-//
-// Revision 3.6.2.3 2008/05/20 06:17:46 taurel
-// - Last commit before merge with trunk
-// (start the implementation of the new DevEncoded data type)
-//
-// Revision 3.6.2.2 2007/11/20 14:40:19 taurel
-// - Add the new way to retrieve command history from polling buffer
-// implemented in Tango V7
-//
-// Revision 3.6.2.1 2007/11/16 14:12:35 taurel
-// - Added a new IDL interface (Device_4)
-// - Added a new way to get attribute history from polling buffer (must faster)
-//
-// Revision 3.6 2007/04/20 14:41:33 taurel
-// - Ported to Windows 64 bits x64 architecture
-//
-// Revision 3.5 2007/03/29 07:08:10 taurel
-// - Change some data types for 64 bits compatibility
-//
-// Revision 3.4 2005/01/13 08:30:00 taurel
-// - Merge trunk with Release_5_0 from brach Release_5_branch
-//
-// Revision 3.3.2.2 2004/10/27 05:59:47 taurel
-// - Some minor changes to compile on all our supported platforms
-//
-// Revision 3.3.2.1 2004/07/15 15:04:06 taurel
-// - Added the way to externally filled the polling buffer for attribute
-// (Command will come soon)
-//
-// Revision 3.3 2004/07/07 08:40:12 taurel
-//
-// - Fisrt commit after merge between Trunk and release 4 branch
-// - Add EventData copy ctor, asiignement operator and dtor
-// - Add Database and DeviceProxy::get_alias() method
-// - Add AttributeProxy ctor from "device_alias/attribute_name"
-// - Exception thrown when subscribing two times for exactly yhe same event
-//
-// Revision 3.2 2003/08/21 07:24:37 taurel
-// - End of the implementation of the new way to transfer data for read and
-// write attributes (better use of exception)
-// - Added Attribute::set_date() and Attribute::set_value_date_quality() methods
-// - Added DeviceAttribute ctors from "const char *"
-// - Enable writing of spectrum and image attributes
-// - Many new DeviceAttribute ctors/inserters to enable easy image and spectrums
-// attribute writing
-// - Attribute date automatically set in case of attribute quality factor set to INVALID
-// - Change in the polling thread discarding element algo. to support case of polling
-// several cmd/atts at the same polling period with cmd/attr having a long response time
-// - Take cmd/attr execution time into account in the "Data not updated since" polling
-// status string
-// - Split "str().c_str()" code in two lines of code. It was the reason of some problem
-// on Windows device server
-// - Add the possibility to set a cmd/attr polling as "externally triggered". Add method
-// to send trigger to the polling thread
-//
-// Revision 3.1 2003/05/28 14:55:10 taurel
-// Add the include (conditionally) of the include files generated by autoconf
-//
-// Revision 3.0 2003/03/25 16:44:08 taurel
-// Many changes for Tango release 3.0 including
-// - Added full logging features
-// - Added asynchronous calls
-// - Host name of clients now stored in black-box
-// - Three serialization model in DS
-// - Fix miscellaneous bugs
-// - Ported to gcc 3.2
-// - Added ApiUtil::cleanup() and destructor methods
-// - Some internal cleanups
-// - Change the way how TangoMonitor class is implemented. It's a recursive
-// mutex
-//
-// Revision 2.9 2003/01/09 12:03:16 taurel
-// - Ported to gcc 3.2
-// - Added ApiUtil::cleanup() and ApiUtil::~ApiUtil() methods
-// - Replace some ORB * by ORB_ptr
-// - Use CORBA::ORB::is_nil() instead of comparing to NULL
-//
-// Revision 2.8 2002/12/16 12:07:33 taurel
-// No change in code at all but only forgot th emost important line in
-// list of updates in the previous release :
-// - Change underlying ORB from ORBacus to omniORB
-//
-// Revision 2.7 2002/12/16 10:16:23 taurel
-// - New method get_device_list() in Util class
-// - Util::get_class_list takes DServer device into account
-// - Util::get_device_by_name() takes DServer device into account
-// - Util::get_device_list_by_class() takes DServer device into account
-// - New parameter to the attribute::set_value() method to enable CORBA to free
-// memory allocated for the attribute
-//
-// Revision 2.6 2002/10/17 07:43:07 taurel
-// Fix bug in history stored by the polling thread :
-// - We need one copy of the attribute data to build an history!!! It is true
-// also for command which return data created by the DeviceImpl::create_xxx
-// methods. Chnage in pollring.cpp/pollring.h/dserverpoll.cpp/pollobj.cpp
-// and pollobj.h
-//
-// Revision 2.5 2002/10/15 11:27:20 taurel
-// Fix bugs in device.cpp file :
-// - Protect the state and status CORBA attribute with the device monitor
-// Add the "TgLibVers" string as a #define in tango_config.h
-//
-// Revision 2.4 2002/08/12 15:06:55 taurel
-// Several big fixes and changes
-// - Remove HP-UX specific code
-// - Fix bug in polling alogorithm which cause the thread to enter an infinite
-// loop (pollthread.cpp)
-// - For bug for Win32 device when trying to set attribute config
-// (attribute.cpp)
-//
-// Revision 2.3 2002/07/02 15:22:25 taurel
-// Miscellaneous small changes/bug fixes for Tango CPP release 2.1.0
-// - classes reference documentation now generated using doxygen instead of doc++
-// - A little file added to the library which summarizes version number.
-// The RCS/CVS "ident" command will now tells you that release library x.y.z is composed
-// by C++ client classes set release a.b and C++ server classes set release c.d
-// - Fix incorrect field setting for DevFailed exception re-thrown from a CORBA exception
-// - It's now not possible to poll the Init command
-// - It's now possible to define a default class doc. per control system
-// instance (using property)
-// - The test done to check if attribute value has been set before it is
-// returned to caller is done only if the attribute quality is set to VALID
-// - The JTCInitialize object is now stored in the Util
-// - Windows specific : The tango.h file now also include winsock.h
-//
-// Revision 2.2 2002/04/30 10:50:42 taurel
-// Don't check alarm on attribute if attribute quality factor is INVALID
-//
-// Revision 2.1 2002/04/29 12:24:04 taurel
-// Fix bug in attribute::set_value method and on the check against min and max value when writing attributes
-//
-// Revision 2.0 2002/04/09 14:45:11 taurel
-// See Tango WEB pages for list of changes
+// $Revision: 20402 $
//
//-============================================================================
diff --git a/lib/cpp/tango.pc.in b/lib/cpp/tango.pc.in
index 50e62f8..870c07d 100644
--- a/lib/cpp/tango.pc.in
+++ b/lib/cpp/tango.pc.in
@@ -1,11 +1,11 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
-includedir=@includedir@/tango
+includedir=@includedir@
Name: tango
Description: The tango constrol system library
Requires: omniDynamic4 >= 4.1.2, omniCOS4, log4tango, libzmq
Version: @VERSION@
Libs: -L${libdir} -ltango
-Cflags: -I${includedir}
+Cflags: -I${includedir}/tango
diff --git a/lib/idl/Makefile.in b/lib/idl/Makefile.in
index f289eae..0174ee7 100644
--- a/lib/idl/Makefile.in
+++ b/lib/idl/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -17,9 +16,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -56,7 +54,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/ac_config.h.tmp
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -64,29 +61,9 @@ am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
- for p in $$list; do echo "$$p $$p"; done | \
- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
- if (++n[$$2] == $(am__install_max)) \
- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
- END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
- test -z "$$files" \
- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && rm -f $$files; }; \
- }
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(idldir)"
+idlDATA_INSTALL = $(INSTALL_DATA)
DATA = $(idl_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
@@ -103,7 +80,6 @@ CFLAGS = @CFLAGS@
CORBA_INCLUDES = @CORBA_INCLUDES@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
-CPP_ELEVEN = @CPP_ELEVEN@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -112,7 +88,6 @@ CYGPATH_W = @CYGPATH_W@
DATADIR = @DATADIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DOXYGEN = @DOXYGEN@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -160,14 +135,11 @@ LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIBZMQ_CFLAGS = @LIBZMQ_CFLAGS@
-LIBZMQ_LIBS = @LIBZMQ_LIBS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MYSQL = @MYSQL@
MYSQLCLIENT_CFLAGS = @MYSQLCLIENT_CFLAGS@
@@ -191,12 +163,9 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
@@ -209,13 +178,11 @@ VERSION_INFO = @VERSION_INFO@
ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
-ZMQ_PREFIX = @ZMQ_PREFIX@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_aux_dir = @ac_aux_dir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -249,6 +216,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -286,9 +254,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/idl/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu lib/idl/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/idl/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu lib/idl/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -306,7 +274,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
mostlyclean-libtool:
-rm -f *.lo
@@ -316,21 +283,20 @@ clean-libtool:
install-idlDATA: $(idl_DATA)
@$(NORMAL_INSTALL)
test -z "$(idldir)" || $(MKDIR_P) "$(DESTDIR)$(idldir)"
- @list='$(idl_DATA)'; test -n "$(idldir)" || list=; \
- for p in $$list; do \
+ @list='$(idl_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(am__base_list) | \
- while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(idldir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(idldir)" || exit $$?; \
+ f=$(am__strip_dir) \
+ echo " $(idlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(idldir)/$$f'"; \
+ $(idlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(idldir)/$$f"; \
done
uninstall-idlDATA:
@$(NORMAL_UNINSTALL)
- @list='$(idl_DATA)'; test -n "$(idldir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- dir='$(DESTDIR)$(idldir)'; $(am__uninstall_files_from_dir)
+ @list='$(idl_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(idldir)/$$f'"; \
+ rm -f "$(DESTDIR)$(idldir)/$$f"; \
+ done
tags: TAGS
TAGS:
@@ -354,17 +320,13 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d "$(distdir)/$$file"; then \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -385,22 +347,16 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- if test -z '$(STRIP)'; then \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- install; \
- else \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
- fi
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -419,8 +375,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -429,28 +383,18 @@ install-data-am: install-idlDATA
install-dvi: install-dvi-am
-install-dvi-am:
-
install-exec-am:
install-html: install-html-am
-install-html-am:
-
install-info: install-info-am
-install-info-am:
-
install-man:
install-pdf: install-pdf-am
-install-pdf-am:
-
install-ps: install-ps-am
-install-ps-am:
-
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -485,7 +429,6 @@ uninstall-am: uninstall-idlDATA
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
uninstall uninstall-am uninstall-idlDATA
-
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/lib/java/Makefile.am b/lib/java/Makefile.am
index 2f4dc97..08bb1b2 100644
--- a/lib/java/Makefile.am
+++ b/lib/java/Makefile.am
@@ -8,7 +8,7 @@ dist_java_DATA=\
DeviceTree-1.8.jar \
ATKCore-4.3.6.jar \
Jive-4.23.jar \
- org.tango.pogo-8.0.2.jar \
+ org.tango.pogo-8.0.3.jar \
atkpanel-4.4.jar \
log4j-1.2.15.jar \
AtkTuning-2.8.jar \
diff --git a/lib/java/Makefile.in b/lib/java/Makefile.in
index c4b149f..fae82d8 100644
--- a/lib/java/Makefile.in
+++ b/lib/java/Makefile.in
@@ -282,7 +282,7 @@ dist_java_DATA = \
DeviceTree-1.8.jar \
ATKCore-4.3.6.jar \
Jive-4.23.jar \
- org.tango.pogo-8.0.2.jar \
+ org.tango.pogo-8.0.3.jar \
atkpanel-4.4.jar \
log4j-1.2.15.jar \
AtkTuning-2.8.jar \
diff --git a/pogo/templates/Makefile.in b/pogo/templates/Makefile.in
index c3cfe70..36f7456 100644
--- a/pogo/templates/Makefile.in
+++ b/pogo/templates/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -17,9 +16,8 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -59,7 +57,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/ac_config.h.tmp
CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -67,33 +64,17 @@ am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
- for p in $$list; do echo "$$p $$p"; done | \
- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
- if (++n[$$2] == $(am__install_max)) \
- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
- END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
- test -z "$$files" \
- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && rm -f $$files; }; \
- }
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(cpp_templatedir)" \
"$(DESTDIR)$(html_templatedir)" \
"$(DESTDIR)$(java_templatedir)" \
"$(DESTDIR)$(python_templatedir)" \
"$(DESTDIR)$(txt_templatedir)"
+dist_cpp_templateDATA_INSTALL = $(INSTALL_DATA)
+dist_html_templateDATA_INSTALL = $(INSTALL_DATA)
+dist_java_templateDATA_INSTALL = $(INSTALL_DATA)
+dist_python_templateDATA_INSTALL = $(INSTALL_DATA)
+dist_txt_templateDATA_INSTALL = $(INSTALL_DATA)
DATA = $(dist_cpp_template_DATA) $(dist_html_template_DATA) \
$(dist_java_template_DATA) $(dist_python_template_DATA) \
$(dist_txt_template_DATA)
@@ -112,7 +93,6 @@ CFLAGS = @CFLAGS@
CORBA_INCLUDES = @CORBA_INCLUDES@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
-CPP_ELEVEN = @CPP_ELEVEN@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -121,7 +101,6 @@ CYGPATH_W = @CYGPATH_W@
DATADIR = @DATADIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DOXYGEN = @DOXYGEN@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -169,14 +148,11 @@ LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIBZMQ_CFLAGS = @LIBZMQ_CFLAGS@
-LIBZMQ_LIBS = @LIBZMQ_LIBS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MYSQL = @MYSQL@
MYSQLCLIENT_CFLAGS = @MYSQLCLIENT_CFLAGS@
@@ -200,12 +176,9 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
@@ -218,13 +191,11 @@ VERSION_INFO = @VERSION_INFO@
ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
-ZMQ_PREFIX = @ZMQ_PREFIX@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_aux_dir = @ac_aux_dir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -258,6 +229,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -353,9 +325,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu pogo/templates/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu pogo/templates/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu pogo/templates/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu pogo/templates/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -373,7 +345,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
mostlyclean-libtool:
-rm -f *.lo
@@ -383,93 +354,88 @@ clean-libtool:
install-dist_cpp_templateDATA: $(dist_cpp_template_DATA)
@$(NORMAL_INSTALL)
test -z "$(cpp_templatedir)" || $(MKDIR_P) "$(DESTDIR)$(cpp_templatedir)"
- @list='$(dist_cpp_template_DATA)'; test -n "$(cpp_templatedir)" || list=; \
- for p in $$list; do \
+ @list='$(dist_cpp_template_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(am__base_list) | \
- while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(cpp_templatedir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(cpp_templatedir)" || exit $$?; \
+ f=$(am__strip_dir) \
+ echo " $(dist_cpp_templateDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(cpp_templatedir)/$$f'"; \
+ $(dist_cpp_templateDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(cpp_templatedir)/$$f"; \
done
uninstall-dist_cpp_templateDATA:
@$(NORMAL_UNINSTALL)
- @list='$(dist_cpp_template_DATA)'; test -n "$(cpp_templatedir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- dir='$(DESTDIR)$(cpp_templatedir)'; $(am__uninstall_files_from_dir)
+ @list='$(dist_cpp_template_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(cpp_templatedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(cpp_templatedir)/$$f"; \
+ done
install-dist_html_templateDATA: $(dist_html_template_DATA)
@$(NORMAL_INSTALL)
test -z "$(html_templatedir)" || $(MKDIR_P) "$(DESTDIR)$(html_templatedir)"
- @list='$(dist_html_template_DATA)'; test -n "$(html_templatedir)" || list=; \
- for p in $$list; do \
+ @list='$(dist_html_template_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(am__base_list) | \
- while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(html_templatedir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(html_templatedir)" || exit $$?; \
+ f=$(am__strip_dir) \
+ echo " $(dist_html_templateDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(html_templatedir)/$$f'"; \
+ $(dist_html_templateDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(html_templatedir)/$$f"; \
done
uninstall-dist_html_templateDATA:
@$(NORMAL_UNINSTALL)
- @list='$(dist_html_template_DATA)'; test -n "$(html_templatedir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- dir='$(DESTDIR)$(html_templatedir)'; $(am__uninstall_files_from_dir)
+ @list='$(dist_html_template_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(html_templatedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(html_templatedir)/$$f"; \
+ done
install-dist_java_templateDATA: $(dist_java_template_DATA)
@$(NORMAL_INSTALL)
test -z "$(java_templatedir)" || $(MKDIR_P) "$(DESTDIR)$(java_templatedir)"
- @list='$(dist_java_template_DATA)'; test -n "$(java_templatedir)" || list=; \
- for p in $$list; do \
+ @list='$(dist_java_template_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(am__base_list) | \
- while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(java_templatedir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(java_templatedir)" || exit $$?; \
+ f=$(am__strip_dir) \
+ echo " $(dist_java_templateDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(java_templatedir)/$$f'"; \
+ $(dist_java_templateDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(java_templatedir)/$$f"; \
done
uninstall-dist_java_templateDATA:
@$(NORMAL_UNINSTALL)
- @list='$(dist_java_template_DATA)'; test -n "$(java_templatedir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- dir='$(DESTDIR)$(java_templatedir)'; $(am__uninstall_files_from_dir)
+ @list='$(dist_java_template_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(java_templatedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(java_templatedir)/$$f"; \
+ done
install-dist_python_templateDATA: $(dist_python_template_DATA)
@$(NORMAL_INSTALL)
test -z "$(python_templatedir)" || $(MKDIR_P) "$(DESTDIR)$(python_templatedir)"
- @list='$(dist_python_template_DATA)'; test -n "$(python_templatedir)" || list=; \
- for p in $$list; do \
+ @list='$(dist_python_template_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(am__base_list) | \
- while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(python_templatedir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(python_templatedir)" || exit $$?; \
+ f=$(am__strip_dir) \
+ echo " $(dist_python_templateDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(python_templatedir)/$$f'"; \
+ $(dist_python_templateDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(python_templatedir)/$$f"; \
done
uninstall-dist_python_templateDATA:
@$(NORMAL_UNINSTALL)
- @list='$(dist_python_template_DATA)'; test -n "$(python_templatedir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- dir='$(DESTDIR)$(python_templatedir)'; $(am__uninstall_files_from_dir)
+ @list='$(dist_python_template_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(python_templatedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(python_templatedir)/$$f"; \
+ done
install-dist_txt_templateDATA: $(dist_txt_template_DATA)
@$(NORMAL_INSTALL)
test -z "$(txt_templatedir)" || $(MKDIR_P) "$(DESTDIR)$(txt_templatedir)"
- @list='$(dist_txt_template_DATA)'; test -n "$(txt_templatedir)" || list=; \
- for p in $$list; do \
+ @list='$(dist_txt_template_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(am__base_list) | \
- while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(txt_templatedir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(txt_templatedir)" || exit $$?; \
+ f=$(am__strip_dir) \
+ echo " $(dist_txt_templateDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(txt_templatedir)/$$f'"; \
+ $(dist_txt_templateDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(txt_templatedir)/$$f"; \
done
uninstall-dist_txt_templateDATA:
@$(NORMAL_UNINSTALL)
- @list='$(dist_txt_template_DATA)'; test -n "$(txt_templatedir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- dir='$(DESTDIR)$(txt_templatedir)'; $(am__uninstall_files_from_dir)
+ @list='$(dist_txt_template_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(txt_templatedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(txt_templatedir)/$$f"; \
+ done
tags: TAGS
TAGS:
@@ -493,17 +459,13 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d "$(distdir)/$$file"; then \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
@@ -524,22 +486,16 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- if test -z '$(STRIP)'; then \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- install; \
- else \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
- fi
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -558,8 +514,6 @@ dvi-am:
html: html-am
-html-am:
-
info: info-am
info-am:
@@ -570,28 +524,18 @@ install-data-am: install-dist_cpp_templateDATA \
install-dvi: install-dvi-am
-install-dvi-am:
-
install-exec-am:
install-html: install-html-am
-install-html-am:
-
install-info: install-info-am
-install-info-am:
-
install-man:
install-pdf: install-pdf-am
-install-pdf-am:
-
install-ps: install-ps-am
-install-ps-am:
-
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -637,7 +581,6 @@ uninstall-am: uninstall-dist_cpp_templateDATA \
uninstall-dist_python_templateDATA \
uninstall-dist_txt_templateDATA
-
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/utils/notifd2db/Makefile.in b/utils/notifd2db/Makefile.in
index 55cb434..ef59012 100644
--- a/utils/notifd2db/Makefile.in
+++ b/utils/notifd2db/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -106,7 +106,6 @@ CYGPATH_W = @CYGPATH_W@
DATADIR = @DATADIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DOXYGEN = @DOXYGEN@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -161,7 +160,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MYSQL = @MYSQL@
MYSQLCLIENT_CFLAGS = @MYSQLCLIENT_CFLAGS@
@@ -203,13 +201,11 @@ VERSION_INFO = @VERSION_INFO@
ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
-ZMQ_PREFIX = @ZMQ_PREFIX@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_aux_dir = @ac_aux_dir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -243,6 +239,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -351,7 +348,7 @@ clean-binPROGRAMS:
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
-notifd2db$(EXEEXT): $(notifd2db_OBJECTS) $(notifd2db_DEPENDENCIES) $(EXTRA_notifd2db_DEPENDENCIES)
+notifd2db$(EXEEXT): $(notifd2db_OBJECTS) $(notifd2db_DEPENDENCIES)
@rm -f notifd2db$(EXEEXT)
$(CXXLINK) $(notifd2db_OBJECTS) $(notifd2db_LDADD) $(LIBS)
@@ -489,15 +486,10 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- if test -z '$(STRIP)'; then \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- install; \
- else \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
- fi
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
clean-generic:
diff --git a/utils/tango_admin/Makefile.in b/utils/tango_admin/Makefile.in
index c3766ce..f859960 100644
--- a/utils/tango_admin/Makefile.in
+++ b/utils/tango_admin/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -115,7 +115,6 @@ CYGPATH_W = @CYGPATH_W@
DATADIR = @DATADIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DOXYGEN = @DOXYGEN@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -170,7 +169,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MYSQL = @MYSQL@
MYSQLCLIENT_CFLAGS = @MYSQLCLIENT_CFLAGS@
@@ -212,13 +210,11 @@ VERSION_INFO = @VERSION_INFO@
ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
-ZMQ_PREFIX = @ZMQ_PREFIX@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_aux_dir = @ac_aux_dir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -252,6 +248,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -363,7 +360,7 @@ clean-binPROGRAMS:
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
-tango_admin$(EXEEXT): $(tango_admin_OBJECTS) $(tango_admin_DEPENDENCIES) $(EXTRA_tango_admin_DEPENDENCIES)
+tango_admin$(EXEEXT): $(tango_admin_OBJECTS) $(tango_admin_DEPENDENCIES)
@rm -f tango_admin$(EXEEXT)
$(CXXLINK) $(tango_admin_OBJECTS) $(tango_admin_LDADD) $(LIBS)
@@ -502,15 +499,10 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- if test -z '$(STRIP)'; then \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- install; \
- else \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
- fi
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
clean-generic:
--
TANGO distributed control system.
More information about the debian-science-commits
mailing list