September 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r66110 - /tags/stable-2_21_2/backup/
by visnov＠svn2.opensuse.org 28 Sep '11

28 Sep '11

Author: visnov Date: Wed Sep 28 19:57:17 2011 New Revision: 66110 URL: http://svn.opensuse.org/viewcvs/yast?rev=66110&view=rev Log: Created tag stable-2_21_2 for backup Added: tags/stable-2_21_2/backup/ - copied from r66109, trunk/backup/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66109 - in /trunk/backup: VERSION package/yast2-backup.changes src/backup.ycp yast2-backup.spec.in
by visnov＠svn2.opensuse.org 28 Sep '11

28 Sep '11

Author: visnov Date: Wed Sep 28 19:57:05 2011 New Revision: 66109 URL: http://svn.opensuse.org/viewcvs/yast?rev=66109&view=rev Log: use Wizard::SetDesktopTitleAndIcon Modified: trunk/backup/VERSION trunk/backup/package/yast2-backup.changes trunk/backup/src/backup.ycp trunk/backup/yast2-backup.spec.in Modified: trunk/backup/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/VERSION?rev=66109&r1=6610… ============================================================================== --- trunk/backup/VERSION (original) +++ trunk/backup/VERSION Wed Sep 28 19:57:05 2011 @@ -1 +1 @@ -2.21.1 +2.21.2 Modified: trunk/backup/package/yast2-backup.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/package/yast2-backup.chan… ============================================================================== --- trunk/backup/package/yast2-backup.changes (original) +++ trunk/backup/package/yast2-backup.changes Wed Sep 28 19:57:05 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Sep 28 19:56:34 CEST 2011 - visnov(a)suse.cz + +- set dialog title +- 2.21.2 + +------------------------------------------------------------------- Fri Sep 23 11:54:55 UTC 2011 - lslezak(a)suse.cz - use Pkg::ResolvableProperties() instead of obsoleted Modified: trunk/backup/src/backup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/src/backup.ycp?rev=66109&… ============================================================================== --- trunk/backup/src/backup.ycp (original) +++ trunk/backup/src/backup.ycp Wed Sep 28 19:57:05 2011 @@ -169,7 +169,7 @@ // create wizard dialog Wizard::CreateDialog(); // set icon - Wizard::SetTitleIcon("yast-backup"); + Wizard::SetDesktopTitleAndIcon("backup"); } Backup::ReadBackupProfiles(); Modified: trunk/backup/yast2-backup.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/yast2-backup.spec.in?rev=… ============================================================================== --- trunk/backup/yast2-backup.spec.in (original) +++ trunk/backup/yast2-backup.spec.in Wed Sep 28 19:57:05 2011 @@ -26,7 +26,7 @@ Requires: perl Requires: tar Requires: util-linux -Requires: yast2 +Requires: yast2 >= 2.21.22 Requires: yast2-nfs-client Requires: yast2-storage # ag_freespace -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66108 - /tags/stable-2_21_1/nis-server/
by visnov＠svn2.opensuse.org 28 Sep '11

28 Sep '11

Author: visnov Date: Wed Sep 28 18:55:53 2011 New Revision: 66108 URL: http://svn.opensuse.org/viewcvs/yast?rev=66108&view=rev Log: Created tag stable-2_21_1 for nis-server Added: tags/stable-2_21_1/nis-server/ - copied from r66107, trunk/nis-server/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66107 - in /trunk/nis-server: VERSION doc/images/workflow.jpg package/yast2-nis-server.changes src/wizards.ycp yast2-nis-server.spec.in
by visnov＠svn2.opensuse.org 28 Sep '11

28 Sep '11

Author: visnov Date: Wed Sep 28 18:55:40 2011 New Revision: 66107 URL: http://svn.opensuse.org/viewcvs/yast?rev=66107&view=rev Log: use Wizard::SetDesktopTitleAndIcon Modified: trunk/nis-server/VERSION trunk/nis-server/doc/images/workflow.jpg trunk/nis-server/package/yast2-nis-server.changes trunk/nis-server/src/wizards.ycp trunk/nis-server/yast2-nis-server.spec.in Modified: trunk/nis-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-server/VERSION?rev=66107&r1=… ============================================================================== --- trunk/nis-server/VERSION (original) +++ trunk/nis-server/VERSION Wed Sep 28 18:55:40 2011 @@ -1 +1 @@ -2.21.0 +2.21.1 Modified: trunk/nis-server/doc/images/workflow.jpg URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-server/doc/images/workflow.j… ============================================================================== Binary files - no diff available. Modified: trunk/nis-server/package/yast2-nis-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-server/package/yast2-nis-ser… ============================================================================== --- trunk/nis-server/package/yast2-nis-server.changes (original) +++ trunk/nis-server/package/yast2-nis-server.changes Wed Sep 28 18:55:40 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Sep 28 18:53:45 CEST 2011 - visnov(a)suse.cz + +- set dialog title +- 2.21.1 + +------------------------------------------------------------------- Mon Aug 8 10:24:14 CEST 2011 - jsuchome(a)suse.cz - remember the settings after clicking Details (bnc#710882) Modified: trunk/nis-server/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-server/src/wizards.ycp?rev=6… ============================================================================== --- trunk/nis-server/src/wizards.ycp (original) +++ trunk/nis-server/src/wizards.ycp Wed Sep 28 18:55:40 2011 @@ -131,7 +131,7 @@ ]; Wizard::CreateDialog(); - Wizard::SetDesktopIcon("nis_server"); + Wizard::SetDesktopTitleAndIcon("nis_server"); symbol ret = Sequencer::Run(aliases, sequence); UI::CloseDialog(); Modified: trunk/nis-server/yast2-nis-server.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-server/yast2-nis-server.spec… ============================================================================== --- trunk/nis-server/yast2-nis-server.spec.in (original) +++ trunk/nis-server/yast2-nis-server.spec.in Wed Sep 28 18:55:40 2011 @@ -8,7 +8,8 @@ Requires: yast2-network yast2-nis-client # NetworkInterfaces -Requires: yast2 >= 2.16.23 +# Wizard::SetDesktopTitleAndIcon +Requires: yast2 >= 2.21.22 Provides: yast2-config-nis-server Obsoletes: yast2-config-nis-server -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66106 - in /branches/SuSE-Code-11-SP2-Branch/fcoe-client: agents/fcoe_config.scr src/FcoeClient.ycp
by gs＠svn2.opensuse.org 28 Sep '11

28 Sep '11

Author: gs Date: Wed Sep 28 13:28:57 2011 New Revision: 66106 URL: http://svn.opensuse.org/viewcvs/yast?rev=66106&view=rev Log: better name for agent Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/agents/fcoe_config.scr branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/agents/fcoe_config.scr URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/agents/fcoe_config.scr (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/agents/fcoe_config.scr Wed Sep 28 13:28:57 2011 @@ -3,26 +3,23 @@ * fcoe_config.scr * Summary: * SCR Agent for reading/writing /etc/fcoe/config - * using the ini-agent + * using the sysconfig agent * Access: * read/write * Authors: * Gabriele Mohr <gs(a)suse.de> - * See: - * yast2-agent-ini/ini.html - * libscr * Example: * Read(.fcoe.config.USE_SYSLOG) * ("yes") ** - * Write(.fcoe.cfg-ethx.USE_SYSLOG, "no") + * Write(.fcoe.config.USE_SYSLOG, "no") * (true) * * * Read/Sets the values defined in <tt>/etc/fcoe/config</tt> * in an easy manner. */ -.fcoe +.fcoe.config `ag_ini( `SysConfigFile("/etc/fcoe/config") Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp Wed Sep 28 13:28:57 2011 @@ -445,6 +445,9 @@ content = (string)SCR::Read(.target.string, file_name); } + // foreach( string var, values, { + // SCR::Read(.fcoe.cfg-ethx.value + vlan_device_name + var); + // }); if ( content != "" ) { list <string> lines = splitstring( content, "\n" ); @@ -719,16 +722,16 @@ // global boolean ReadFcoeConfig() { - list <string> options = (list<string>) SCR::Dir(.fcoe); + list <string> options = (list<string>) SCR::Dir(.fcoe.config); y2milestone( "List of options in /etc/fcoe/config: %1", options ); if ( options == [] || options == nil ) return false; - string debug_val = (string)SCR::Read(add(.fcoe, "DEBUG")); + string debug_val = (string)SCR::Read(add(.fcoe.config, "DEBUG")); fcoe_general_config = add( fcoe_general_config, "DEBUG", debug_val ); - string syslog_val = (string)SCR::Read(add(.fcoe, "USE_SYSLOG")); + string syslog_val = (string)SCR::Read(add(.fcoe.config, "USE_SYSLOG")); fcoe_general_config = add( fcoe_general_config, "USE_SYSLOG", syslog_val ); y2milestone( "/etc/fcoe/config read: DEBUG: %1, USE_SYSLOG: %2", debug_val, syslog_val ); @@ -743,16 +746,16 @@ { boolean ret = true; - boolean success = (boolean)SCR::Write(add(.fcoe, "DEBUG"), GetFcoeConfig()["DEBUG"]:"" ); + boolean success = (boolean)SCR::Write(add(.fcoe.config, "DEBUG"), GetFcoeConfig()["DEBUG"]:"" ); if ( !success ) ret = false; - success = (boolean)SCR::Write(add(.fcoe, "USE_SYSLOG"), GetFcoeConfig()["USE_SYSLOG"]:"" ); + success = (boolean)SCR::Write(add(.fcoe.config, "USE_SYSLOG"), GetFcoeConfig()["USE_SYSLOG"]:"" ); if ( !success ) ret = false; // This is very important- it flushes the cache, and stores the configuration on the disk - SCR::Write(.fcoe, nil); + SCR::Write(.fcoe.config, nil); return ret; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66105 - /tags/stable-2_21_5/iscsi-client/
by visnov＠svn2.opensuse.org 28 Sep '11

28 Sep '11

Author: visnov Date: Wed Sep 28 09:33:26 2011 New Revision: 66105 URL: http://svn.opensuse.org/viewcvs/yast?rev=66105&view=rev Log: Created tag stable-2_21_5 for iscsi-client Added: tags/stable-2_21_5/iscsi-client/ - copied from r66104, trunk/iscsi-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66104 - in /trunk/iscsi-client: VERSION package/yast2-iscsi-client.changes src/wizards.ycp yast2-iscsi-client.spec.in
by visnov＠svn2.opensuse.org 28 Sep '11

28 Sep '11

Author: visnov Date: Wed Sep 28 09:33:16 2011 New Revision: 66104 URL: http://svn.opensuse.org/viewcvs/yast?rev=66104&view=rev Log: use Wizard::SetDesktopTitleAndIcon Modified: trunk/iscsi-client/VERSION trunk/iscsi-client/package/yast2-iscsi-client.changes trunk/iscsi-client/src/wizards.ycp trunk/iscsi-client/yast2-iscsi-client.spec.in Modified: trunk/iscsi-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/VERSION?rev=66104&r… ============================================================================== --- trunk/iscsi-client/VERSION (original) +++ trunk/iscsi-client/VERSION Wed Sep 28 09:33:16 2011 @@ -1 +1 @@ -2.21.4 +2.21.5 Modified: trunk/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/package/yast2-iscsi… ============================================================================== --- trunk/iscsi-client/package/yast2-iscsi-client.changes (original) +++ trunk/iscsi-client/package/yast2-iscsi-client.changes Wed Sep 28 09:33:16 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Sep 28 09:31:32 CEST 2011 - visnov(a)suse.cz + +- set dialog title +- 2.21.5 + +------------------------------------------------------------------- Mon Sep 19 14:42:58 CEST 2011 - visnov(a)suse.cz - remove dependency on Wizard_hw Modified: trunk/iscsi-client/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/wizards.ycp?rev… ============================================================================== --- trunk/iscsi-client/src/wizards.ycp (original) +++ trunk/iscsi-client/src/wizards.ycp Wed Sep 28 09:33:16 2011 @@ -111,6 +111,8 @@ ]; Wizard::OpenCancelOKDialog(); + if (Mode::normal ()) + Wizard::SetDesktopTitleAndIcon("iscsi-client"); any ret = Sequencer::Run(aliases, sequence); Modified: trunk/iscsi-client/yast2-iscsi-client.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/yast2-iscsi-client.… ============================================================================== --- trunk/iscsi-client/yast2-iscsi-client.spec.in (original) +++ trunk/iscsi-client/yast2-iscsi-client.spec.in Wed Sep 28 09:33:16 2011 @@ -10,7 +10,8 @@ # network needs Wizard::OpenCancelOKDialog() # function from yast2-2.18.2 -Requires: yast2 >= 2.18.2 +# Wizard::SetDesktopTitleAndIcon +Requires: yast2 >= 2.21.22 BuildArchitectures: noarch -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66103 - /branches/unsupported/fax-server/ /trunk/fax-server/
by visnov＠svn2.opensuse.org 28 Sep '11

28 Sep '11

Author: visnov Date: Wed Sep 28 09:28:12 2011 New Revision: 66103 URL: http://svn.opensuse.org/viewcvs/yast?rev=66103&view=rev Log: never really realized module Added: branches/unsupported/fax-server/ - copied from r66102, trunk/fax-server/ Removed: trunk/fax-server/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66102 - in /trunk/drbd: ./ agents/ doc/ doc/autodocs/ package/ src/ testsuite/
by visnov＠svn2.opensuse.org 28 Sep '11

28 Sep '11

Author: visnov Date: Wed Sep 28 09:26:53 2011 New Revision: 66102 URL: http://svn.opensuse.org/viewcvs/yast?rev=66102&view=rev Log: small cleanup, it seems this module lives mostly outside of YaST SVN Added: trunk/drbd/Makefile.cvs trunk/drbd/package/ trunk/drbd/package/yast2-drbd.changes Removed: trunk/drbd/Makefile.am trunk/drbd/Makefile.am.common trunk/drbd/aclocal.m4 trunk/drbd/config.guess trunk/drbd/config.sub trunk/drbd/configure trunk/drbd/install-sh trunk/drbd/missing trunk/drbd/src/Makefile.in Modified: trunk/drbd/ (props changed) trunk/drbd/Makefile.in trunk/drbd/agents/Makefile.in trunk/drbd/agents/ag_drbd trunk/drbd/autodocs-ycp.ami trunk/drbd/configure.in trunk/drbd/doc/Makefile.in trunk/drbd/doc/autodocs/ (props changed) trunk/drbd/doc/autodocs/Makefile.in trunk/drbd/src/ (props changed) trunk/drbd/src/drbd.desktop trunk/drbd/src/wizards.ycp trunk/drbd/testsuite/Makefile.in Added: trunk/drbd/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/drbd/Makefile.cvs?rev=66102&view… ============================================================================== --- trunk/drbd/Makefile.cvs (added) +++ trunk/drbd/Makefile.cvs Wed Sep 28 09:26:53 2011 @@ -0,0 +1,23 @@ +# +# Makefile.cvs +# + +LIB = $(shell y2tool get-lib) + +PREFIX = /usr + +configure: all + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) + +all: + y2tool y2autoconf + y2tool y2automake + autoreconf --force --install + +install: configure + make + make install + +reconf: all + ./config.status --recheck + ./config.status Modified: trunk/drbd/Makefile.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/drbd/Makefile.in?rev=66102&r1=66… ============================================================================== --- trunk/drbd/Makefile.in (original) +++ trunk/drbd/Makefile.in Wed Sep 28 09:26:53 2011 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.9.6 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 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. @@ -22,15 +23,12 @@ # (Edit ./SUBDIRS instead) # -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = . +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -46,37 +44,57 @@ host_triplet = @host@ target_triplet = @target@ @CREATE_PKGCONFIG_TRUE@am__append_1 = $(RPMNAME).pc.in -DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/configure config.guess \ - config.sub install-sh missing subdir = . +DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(top_srcdir)/configure COPYING \ + config.guess config.sub install-sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno configure.status.lineno + configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +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__installdirs = "$(DESTDIR)$(pkgconfigdir)" \ "$(DESTDIR)$(pkgconfigdatadir)" -pkgconfigDATA_INSTALL = $(INSTALL_DATA) -pkgconfigdataDATA_INSTALL = $(INSTALL_DATA) DATA = $(pkgconfig_DATA) $(pkgconfigdata_DATA) +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ + distdir dist dist-all distcheck ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -84,11 +102,36 @@ distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } -DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 + { test ! -d "$(distdir)" \ + || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -fr "$(distdir)"; }; } +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^$[^/]*$/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/$[^/]*$$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" GZIP_ENV = --best +DIST_ARCHIVES = $(distdir).tar.bz2 distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ @@ -97,15 +140,12 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CREATE_PKGCONFIG_FALSE = @CREATE_PKGCONFIG_FALSE@ -CREATE_PKGCONFIG_NOARCH_FALSE = @CREATE_PKGCONFIG_NOARCH_FALSE@ -CREATE_PKGCONFIG_NOARCH_TRUE = @CREATE_PKGCONFIG_NOARCH_TRUE@ -CREATE_PKGCONFIG_TRUE = @CREATE_PKGCONFIG_TRUE@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -116,11 +156,13 @@ LTLIBOBJS = @LTLIBOBJS@ MAINTAINER = @MAINTAINER@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ PACKAGE = @PACKAGE@ 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_PATH = @PKG_CONFIG_PATH@ @@ -135,10 +177,14 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = $(shell cat $(srcdir)/VERSION) XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YCPC = @YCPC@ YCPDOC = @YCPDOC@ YCPMAKEDEP = @YCPMAKEDEP@ -ac_ct_STRIP = @ac_ct_STRIP@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ agentdir = @agentdir@ am__leading_dot = @am__leading_dot@ am__tar = @am__tar@ @@ -149,10 +195,13 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ clientdir = @clientdir@ datadir = @datadir@ +datarootdir = @datarootdir@ desktopdir = @desktopdir@ docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ execcompdir = @execcompdir@ fillupdir = @fillupdir@ @@ -161,6 +210,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ imagedir = @imagedir@ includedir = @includedir@ infodir = @infodir@ @@ -173,16 +223,19 @@ mkdir_p = @mkdir_p@ moduledir = @moduledir@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pkgconfigdatadir = @pkgconfigdatadir@ pkgconfigdir = @pkgconfigdir@ plugindir = @plugindir@ potdir = @potdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ schemadir = @schemadir@ scrconfdir = @scrconfdir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ @@ -190,6 +243,9 @@ target_os = @target_os@ target_vendor = @target_vendor@ themedir = @themedir@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ yast2dir = @yast2dir@ ybindir = @ybindir@ ydatadir = @ydatadir@ @@ -197,27 +253,27 @@ ystartupdir = @ystartupdir@ #where devtools are -PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) -Y2TOOL = $(PREFIX)/bin/y2tool +Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools) -ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) -COPYRIGHT_files_gpl = README COPYING COPYRIGHT.english +COPYRIGHT_files_gpl = README COPYING COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) -AUTOMAKE_OPTIONS = foreign dist-bzip2 -# where devtools instal m4 snippets + +# less strict; prefer bzip2 +AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip +# where devtools install m4 snippets # argh, executed literally -#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal CLEANFILES = MAINTAINERCLEANFILES = package/$(RPMNAME)-$(VERSION).tar.bz2 package/$(RPMNAME).spec POT_DST = $(shell find -type d -name testsuite -prune , \ @@ -229,8 +285,7 @@ @CREATE_PKGCONFIG_NOARCH_TRUE@@CREATE_PKGCONFIG_TRUE@pkgconfigdata_DATA = $(RPMNAME).pc @CREATE_PKGCONFIG_NOARCH_FALSE@@CREATE_PKGCONFIG_TRUE@pkgconfig_DATA = $(RPMNAME).pc TAGVERSION = $(Y2TOOL) tagversion -# test ! -d $(srcdir)/po \ -# || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; } +# test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox # No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am SUBDIRS = agents doc src testsuite all: all-recursive @@ -242,15 +297,15 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \ - cd $(srcdir) && $(AUTOMAKE) --foreign \ + echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \ + $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \ && exit 0; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -266,44 +321,50 @@ $(SHELL) ./config.status --recheck $(top_srcdir)/configure: $(am__configure_deps) - cd $(srcdir) && $(AUTOCONF) + $(am__cd) $(srcdir) && $(AUTOCONF) $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -uninstall-info-am: + $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +$(am__aclocal_m4_deps): install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) - test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)" - @list='$(pkgconfig_DATA)'; for p in $$list; do \ + test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" + @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ - $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \ done uninstall-pkgconfigDATA: @$(NORMAL_UNINSTALL) - @list='$(pkgconfig_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ - rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \ - done + @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files install-pkgconfigdataDATA: $(pkgconfigdata_DATA) @$(NORMAL_INSTALL) - test -z "$(pkgconfigdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdatadir)" - @list='$(pkgconfigdata_DATA)'; for p in $$list; do \ + test -z "$(pkgconfigdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdatadir)" + @list='$(pkgconfigdata_DATA)'; test -n "$(pkgconfigdatadir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(pkgconfigdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdatadir)/$$f'"; \ - $(pkgconfigdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdatadir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdatadir)" || exit $$?; \ done uninstall-pkgconfigdataDATA: @$(NORMAL_UNINSTALL) - @list='$(pkgconfigdata_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(pkgconfigdatadir)/$$f'"; \ - rm -f "$(DESTDIR)$(pkgconfigdatadir)/$$f"; \ - done + @list='$(pkgconfigdata_DATA)'; test -n "$(pkgconfigdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgconfigdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgconfigdatadir)" && rm -f $$files # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -312,7 +373,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -329,16 +390,15 @@ else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: - @failcom='exit 1'; \ +$(RECURSIVE_CLEAN_TARGETS): + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -364,16 +424,16 @@ else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done ctags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -381,14 +441,14 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ include_option=--etags-include; \ @@ -400,84 +460,103 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) $(am__remove_distdir) - mkdir $(distdir) - $(mkdir_p) $(distdir)/$(srcdir) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + test -d "$(distdir)" || mkdir "$(distdir)" + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - 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 -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$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 - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + am__skip_mode_fix=: \ distdir) \ || exit 1; \ fi; \ @@ -485,11 +564,13 @@ $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$(top_distdir)" distdir="$(distdir)" \ dist-hook - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + -test -n "$(am__skip_mode_fix)" \ + || find "$(distdir)" -type d ! -perm -755 \ + -exec chmod u+rwx,go+rx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r $(distdir) + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ + || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) @@ -497,6 +578,14 @@ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) +dist-lzma: distdir + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma + $(am__remove_distdir) + +dist-xz: distdir + tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz + $(am__remove_distdir) + dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -511,7 +600,6 @@ $(am__remove_distdir) dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) @@ -521,13 +609,17 @@ distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ + lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.xz*) \ + xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac @@ -535,9 +627,11 @@ mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) + test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && cd $(distdir)/_build \ + && am__cwd=`pwd` \ + && $(am__cd) $(distdir)/_build \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ @@ -559,13 +653,15 @@ && rm -rf "$$dc_destdir" \ && $(MAKE) $(AM_MAKEFLAGS) dist \ && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ + && cd "$$am__cwd" \ + || exit 1 $(am__remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: - @cd $(distuninstallcheck_dir) \ + @$(am__cd) '$(distuninstallcheck_dir)' \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ @@ -588,7 +684,7 @@ installdirs: installdirs-recursive installdirs-am: for dir in "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkgconfigdatadir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive install-exec: install-exec-recursive @@ -611,6 +707,7 @@ 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" @@ -631,6 +728,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -638,12 +737,30 @@ install-data-am: install-data-local install-pkgconfigDATA \ install-pkgconfigdataDATA +install-dvi: install-dvi-recursive + +install-dvi-am: + install-exec-am: +install-html: install-html-recursive + +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: +install-pdf: install-pdf-recursive + +install-pdf-am: + +install-ps: install-ps-recursive + +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -664,26 +781,26 @@ ps-am: -uninstall-am: uninstall-info-am uninstall-pkgconfigDATA \ - uninstall-pkgconfigdataDATA +uninstall-am: uninstall-pkgconfigDATA uninstall-pkgconfigdataDATA -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ + install-am install-strip tags-recursive -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ - check-am clean clean-generic clean-recursive ctags \ - ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-hook \ - dist-shar dist-tarZ dist-zip distcheck distclean \ - distclean-generic distclean-recursive distclean-tags \ +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am am--refresh check check-am clean clean-generic \ + ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ + dist-hook dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ + distcheck distclean distclean-generic distclean-tags \ distcleancheck distdir distuninstallcheck dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-data-local install-exec \ - install-exec-am install-info install-info-am install-man \ - install-pkgconfigDATA install-pkgconfigdataDATA install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-info-am \ + install-data-am install-data-local install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-pkgconfigDATA install-pkgconfigdataDATA \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ uninstall-pkgconfigDATA uninstall-pkgconfigdataDATA @@ -705,7 +822,7 @@ # because the prerequisite is made here (not anymore!) # and we don't want any paths in y2autoconf # info '(autoconf)config.status Invocation' -@CREATE_PKGCONFIG_TRUE@$(RPMNAME).pc: $(RPMNAME).pc.in +@CREATE_PKGCONFIG_TRUE@$(RPMNAME).pc: $(RPMNAME).pc.in config.status @CREATE_PKGCONFIG_TRUE@ ./config.status --file=$@:$< dist-hook: @@ -784,7 +901,7 @@ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ done -package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local +package: check-up-to-date check-tagversion check-textdomain package-local check-up-to-date check-cvs-up-to-date check-svn-up-to-date: if [ -d $(srcdir)/CVS ]; then \ @@ -812,21 +929,6 @@ check-parse: @echo "Not running parseycp." -check-all-packages: - @if [ ! -e "$(ALL_PACKAGES)" ]; then \ - echo ERROR: "Can't find $(ALL_PACKAGES)"; false; \ - fi - @if ! grep -q "^$(RPMNAME)[[:space:]]" $(ALL_PACKAGES); then \ - echo ERROR: "$(RPMNAME) not in $(ALL_PACKAGES)"; false; \ - fi - @if grep -q "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); then \ - echo ERROR: "$(RPMNAME) info in $(ALL_PACKAGES) contains some unknown (?) fields:"; \ - echo; \ - grep "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); \ - echo; \ - false; \ - fi - check-textdomain: $(Y2TOOL) check-textdomain $(srcdir) @@ -837,7 +939,8 @@ # For po/ modules checkpo: - test ! -d $(srcdir)/po || $(MAKE) -C po checkpo + test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo + # 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: Modified: trunk/drbd/agents/Makefile.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/drbd/agents/Makefile.in?rev=6610… ============================================================================== --- trunk/drbd/agents/Makefile.in (original) +++ trunk/drbd/agents/Makefile.in Wed Sep 28 09:26:53 2011 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.9.6 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 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. @@ -17,15 +18,12 @@ # Makefile.am for drbd/agents -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -48,18 +46,32 @@ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = -am__installdirs = "$(DESTDIR)$(agentdir)" "$(DESTDIR)$(scrconfdir)" -agentSCRIPT_INSTALL = $(INSTALL_SCRIPT) -SCRIPTS = $(agent_SCRIPTS) -SOURCES = -DIST_SOURCES = +CONFIG_CLEAN_VPATH_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -scrconfDATA_INSTALL = $(INSTALL_DATA) +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__installdirs = "$(DESTDIR)$(agentdir)" "$(DESTDIR)$(scrconfdir)" +SCRIPTS = $(agent_SCRIPTS) +SOURCES = +DIST_SOURCES = DATA = $(scrconf_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -68,15 +80,12 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CREATE_PKGCONFIG_FALSE = @CREATE_PKGCONFIG_FALSE@ -CREATE_PKGCONFIG_NOARCH_FALSE = @CREATE_PKGCONFIG_NOARCH_FALSE@ -CREATE_PKGCONFIG_NOARCH_TRUE = @CREATE_PKGCONFIG_NOARCH_TRUE@ -CREATE_PKGCONFIG_TRUE = @CREATE_PKGCONFIG_TRUE@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -87,11 +96,13 @@ LTLIBOBJS = @LTLIBOBJS@ MAINTAINER = @MAINTAINER@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ PACKAGE = @PACKAGE@ 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_PATH = @PKG_CONFIG_PATH@ @@ -106,9 +117,14 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YCPC = @YCPC@ YCPDOC = @YCPDOC@ YCPMAKEDEP = @YCPMAKEDEP@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ agentdir = @agentdir@ am__leading_dot = @am__leading_dot@ am__tar = @am__tar@ @@ -119,6 +135,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ clientdir = @clientdir@ datadir = @datadir@ datarootdir = @datarootdir@ @@ -158,6 +175,7 @@ schemadir = @schemadir@ scrconfdir = @scrconfdir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ @@ -165,6 +183,9 @@ target_os = @target_os@ target_vendor = @target_vendor@ themedir = @themedir@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ yast2dir = @yast2dir@ ybindir = @ybindir@ ydatadir = @ydatadir@ @@ -184,14 +205,14 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu agents/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu agents/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu agents/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu agents/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -209,43 +230,61 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): install-agentSCRIPTS: $(agent_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(agentdir)" || $(mkdir_p) "$(DESTDIR)$(agentdir)" - @list='$(agent_SCRIPTS)'; for p in $$list; do \ + test -z "$(agentdir)" || $(MKDIR_P) "$(DESTDIR)$(agentdir)" + @list='$(agent_SCRIPTS)'; test -n "$(agentdir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f $$d$$p; then \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " $(agentSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(agentdir)/$$f'"; \ - $(agentSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(agentdir)/$$f"; \ - else :; fi; \ - done + if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n' \ + -e 'h;s|.*|.|' \ + -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) { files[d] = files[d] " " $$1; \ + if (++n[d] == $(am__install_max)) { \ + print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ + else { print "f", d "/" $$4, $$1 } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(agentdir)$$dir'"; \ + $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(agentdir)$$dir" || exit $$?; \ + } \ + ; done uninstall-agentSCRIPTS: @$(NORMAL_UNINSTALL) - @list='$(agent_SCRIPTS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " rm -f '$(DESTDIR)$(agentdir)/$$f'"; \ - rm -f "$(DESTDIR)$(agentdir)/$$f"; \ - done -uninstall-info-am: + @list='$(agent_SCRIPTS)'; test -n "$(agentdir)" || exit 0; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 's,.*/,,;$(transform)'`; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(agentdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(agentdir)" && rm -f $$files install-scrconfDATA: $(scrconf_DATA) @$(NORMAL_INSTALL) - test -z "$(scrconfdir)" || $(mkdir_p) "$(DESTDIR)$(scrconfdir)" - @list='$(scrconf_DATA)'; for p in $$list; do \ + test -z "$(scrconfdir)" || $(MKDIR_P) "$(DESTDIR)$(scrconfdir)" + @list='$(scrconf_DATA)'; test -n "$(scrconfdir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(scrconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(scrconfdir)/$$f'"; \ - $(scrconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(scrconfdir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(scrconfdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(scrconfdir)" || exit $$?; \ done uninstall-scrconfDATA: @$(NORMAL_UNINSTALL) - @list='$(scrconf_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(scrconfdir)/$$f'"; \ - rm -f "$(DESTDIR)$(scrconfdir)/$$f"; \ - done + @list='$(scrconf_DATA)'; test -n "$(scrconfdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(scrconfdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(scrconfdir)" && rm -f $$files tags: TAGS TAGS: @@ -254,29 +293,32 @@ distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - 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 -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$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 @@ -285,7 +327,7 @@ all-am: Makefile $(SCRIPTS) $(DATA) installdirs: for dir in "$(DESTDIR)$(agentdir)" "$(DESTDIR)$(scrconfdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -307,6 +349,7 @@ 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" @@ -325,18 +368,38 @@ html: html-am +html-am: + info: info-am info-am: install-data-am: install-agentSCRIPTS install-scrconfDATA +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 @@ -355,24 +418,28 @@ ps-am: -uninstall-am: uninstall-agentSCRIPTS uninstall-info-am \ - uninstall-scrconfDATA +uninstall-am: uninstall-agentSCRIPTS uninstall-scrconfDATA + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am html html-am info info-am \ install install-agentSCRIPTS install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-scrconfDATA install-strip \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-scrconfDATA install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ pdf-am ps ps-am uninstall uninstall-agentSCRIPTS uninstall-am \ - uninstall-info-am uninstall-scrconfDATA + uninstall-scrconfDATA ag_drbd: drbd.rb.yy rm -f drbd.rb racc -e "/usr/bin/ruby" -v -g drbd.rb.yy -o ag_drbd chmod ugo+x ag_drbd + # 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: Modified: trunk/drbd/agents/ag_drbd URL: http://svn.opensuse.org/viewcvs/yast/trunk/drbd/agents/ag_drbd?rev=66102&r1… ============================================================================== --- trunk/drbd/agents/ag_drbd (original) +++ trunk/drbd/agents/ag_drbd Wed Sep 28 09:26:53 2011 @@ -13,23 +13,19 @@ class DrbdParser < Racc::Parser -module_eval <<'..end drbd.rb.yy modeval..idcb652328cb', 'drbd.rb.yy', 100 +module_eval <<'..end drbd.rb.yy modeval..id56022be3c0', 'drbd.rb.yy', 149 def parse(str) -# @yydebug = true + @yydebug = false @q = [] until str.empty? || !str case str when /\A\s+/ when /\Adisable-ip-verification/ @q.push [:TK_DISABLE_IP_VERIFICATION, 'disable-ip-verification'] - when /\Adisable-io-hints/ - @q.push [:TK_DISABLE_IO_HINTS, 'disable-io-hints'] - when /\Aincon-degr-cmd/ - @q.push [:TK_INCON_DEGR_CMD, 'incon-degr-cmd'] + when /\Ausage-count/ + @q.push [:TK_USAGE_COUNT, 'usage-count'] when /\Adialog-refresh/ @q.push [:TK_DIALOG_REFRESH, 'dialog-refresh'] - when /\Aon-disconnect/ - @q.push [:TK_ON_DISCONNECT, 'on-disconnect'] when /\Aon-io-error/ @q.push [:TK_ON_IO_ERROR, 'on-io-error'] when /\Aglobal/ @@ -38,10 +34,12 @@ @q.push [:TK_MINOR_COUNT, 'minor-count'] when /\Aresource/ @q.push [:TK_RESOURCE, 'resource'] + when /\Acommon/ + @q.push [:TK_COMMON, 'common'] when /\Aprotocol/ @q.push [:TK_PROTOCOL, 'protocol'] when /\Adisk\s*\{/ - @q.push [:TK_DISK_S, 'disk'] + @q.push [:TK_DISK_S, 'disk_s'] when /\Adisk/ @q.push [:TK_DISK, 'disk'] when /\Anet/ @@ -50,12 +48,80 @@ @q.push [:TK_SYNCER, 'syncer'] when /\Astartup/ @q.push [:TK_STARTUP, 'startup'] + when /\Ahandlers/ + @q.push [:TK_HANDLERS, 'handlers'] + when /\Afencing/ + @q.push [:TK_FENCING, 'fencing'] + when /\Ause-bmbv/ + @q.push [:TK_USE_BMBV, 'use-bmbv'] + when /\Ano-disk-barrier/ + @q.push [:TK_NO_DISK_BARRIER, 'no-disk-barrier'] + when /\Ano-disk-flushes/ + @q.push [:TK_NO_DISK_FLUSHES, 'no-disk-flushes'] + when /\Ano-disk-drain/ + @q.push [:TK_NO_DISK_DRAIN, 'no-disk-drain'] + when /\Ano-md-flushes/ + @q.push [:TK_NO_MD_FLUSHES, 'no-md-flushes'] + when /\Amax-bio-bvecs/ + @q.push [:TK_MAX_BIO_BVECS, 'max-bio-bvecs'] + when /\Aping-timeout/ + @q.push [:TK_PING_TIMEOUT, 'ping-timeout'] + when /\Aallow-two-primaries/ + @q.push [:TK_ALLOW_TWO_PRIMARIES, 'allow-two-primaries'] + when /\Acram-hmac-alg/ + @q.push [:TK_CRAM_HMAC_ALG, 'cram-hmac-alg'] + when /\Ashared-secret/ + @q.push [:TK_SHARED_SECRET, 'shared-secret'] + when /\Aafter-sb-0pri/ + @q.push [:TK_AFTER_SB_0PRI, 'after-sb-0pri'] + when /\Aafter-sb-1pri/ + @q.push [:TK_AFTER_SB_0PRI, 'after-sb-1pri'] + when /\Aafter-sb-2pri/ + @q.push [:TK_AFTER_SB_0PRI, 'after-sb-2pri'] + when /\Adata-integrity-alg/ + @q.push [:TK_DATA_INTEGRITY_ALG, 'data-integrity-alg'] + when /\Arr-conflict/ + @q.push [:TK_RR_CONFLICT, 'rr-conflict'] + when /\Apri-on-incon-degr/ + @q.push [:TK_PRI_ON_INCON_DEGR, 'pri-on-incon-degr'] + when /\Apri-lost-after-sb/ + @q.push [:TK_PRI_LOST_AFTER_SB, 'pri-lost-after-sb'] + when /\Apri-lost/ + @q.push [:TK_PRI_LOST, 'pri-lost'] + when /\Aoutdate-peer/ + @q.push [:TK_OUTDATE_PEER, 'outdate-peer'] + when /\Alocal-io-error/ + @q.push [:TK_LOCAL_IO_ERROR, 'local-io-error'] + when /\Asplit-brain/ + @q.push [:TK_SPLIT_BRAIN, 'split-brain'] + when /\Abefore-resync-target/ + @q.push [:TK_BEFORE_RESYNC_TARGET, 'before-rsync-target'] + when /\Aafter-resync-target/ + @q.push [:TK_AFTER_RESYNC_TARGET, 'after-resync-target'] + when /\Await-after-sb/ + @q.push [:TK_WAIT_AFTER_SB, 'wait-after-sb'] + when /\Abecome-primary-on/ + @q.push [:TK_BECOME_PRIMARY_ON, 'become-primary-on'] + when /\Ano-tcp-cork/ + @q.push [:TK_NO_TCP_CORK, 'no-tcp-cork'] + when /\Acpu-mask/ + @q.push [:TK_CPU_MASK, 'cpu-mask'] + when /\Averify-alg/ + @q.push [:TK_VERIFY_ALG, 'verify-alg'] when /\Asize/ @q.push [:TK_SIZE, 'size'] when /\Atimeout/ @q.push [:TK_TIMEOUT, 'timeout'] when /\Aconnect-int/ @q.push [:TK_CONNECT_INT, 'connect-int'] + when /\Aafter-sb-0pri/ + @q.push [:TK_AFTER_SB_0PRI, 'after-sb-0pri'] + when /\Aafter-sb-1pri/ + @q.push [:TK_AFTER_SB_0PRI, 'after-sb-1pri'] + when /\Aafter-sb-2pri/ + @q.push [:TK_AFTER_SB_0PRI, 'after-sb-2pri'] + when /\Arr-conflict/ + @q.push [:TK_RR_CONFLICT, 'rr-conflict'] when /\Aping-int/ @q.push [:TK_PING_INT, 'ping-int'] when /\Amax-buffers/ @@ -68,32 +134,34 @@ @q.push [:TK_SNDBUF_SIZE, 'sndbuf-size'] when /\Ako-count/ @q.push [:TK_KO_COUNT, 'ko-count'] - when /\Askip-sync/ - @q.push [:TK_SKIP_SYNC, 'skip-sync'] - when /\Ause-csums/ - @q.push [:TK_USE_CSUMS, 'use-csums'] when /\Arate/ @q.push [:TK_RATE, 'rate'] - when /\Agroup/ - @q.push [:TK_SYNC_GROUP, 'group'] when /\Aal-extents/ @q.push [:TK_AL_EXTENTS, 'al-extents'] + when /\Aafter/ + @q.push [:TK_AFTER, 'after'] when /\Adevice/ @q.push [:TK_DEVICE, 'device'] when /\Aaddress/ @q.push [:TK_ADDRESS, 'address'] when /\Ameta-disk/ @q.push [:TK_META_DISK, 'meta-disk'] - when /\Awfc-timeout/ - @q.push [:TK_WFC_TIMEOUT, 'wfc-timeout'] + when /\Aflexible-meta-disk/ + @q.push [:TK_FLEXIBLE_META_DISK, 'flexible-meta-disk'] when /\Adegr-wfc-timeout/ @q.push [:TK_DEGR_WFC_TIMEOUT, 'degr-wfc-timeout'] + when /\Awfc-timeout/ + @q.push [:TK_WFC_TIMEOUT, 'wfc-timeout'] + when /\Aipv6/ + @q.push [:TK_IPV6, 'ipv6'] when /\Aon\s*/ @q.push [:TK_ON, 'on'] when /\A"[^"]*"/ @q.push [:TK_STRING, $&] + when /\A\[[\w\.\/:]+:[\w\.\/:]+\]/ + @q.push [:TK_IPV6ADDR, $&] when /\A[\w\.\/\[\]-]+/ - @q.push [:TK_STRING, $&] + @q.push [:TK_STRING, $&] when /\A.|\n/o s = $& @q.push [s, s] @@ -108,143 +176,255 @@ @q.shift end -..end drbd.rb.yy modeval..idcb652328cb +..end drbd.rb.yy modeval..id56022be3c0 ##### racc 1.4.5 generates ### racc_reduce_table = [ 0, 0, :racc_error, - 2, 45, :_reduce_1, - 0, 46, :_reduce_2, - 4, 46, :_reduce_3, - 0, 48, :_reduce_4, - 3, 48, :_reduce_5, - 1, 49, :_reduce_6, - 1, 49, :_reduce_7, - 2, 49, :_reduce_8, - 2, 49, :_reduce_9, - 0, 47, :_reduce_10, - 2, 47, :_reduce_11, - 5, 50, :_reduce_12, - 1, 51, :_reduce_13, - 0, 52, :_reduce_14, - 3, 52, :_reduce_15, - 2, 52, :_reduce_16, - 2, 53, :_reduce_17, - 2, 53, :_reduce_18, - 3, 54, :_reduce_19, - 4, 54, :_reduce_20, - 4, 54, :_reduce_21, - 4, 54, :_reduce_22, - 5, 54, :_reduce_23, - 1, 59, :_reduce_24, - 0, 55, :_reduce_25, - 3, 55, :_reduce_26, - 2, 61, :_reduce_27, - 2, 61, :_reduce_28, - 0, 56, :_reduce_29, - 3, 56, :_reduce_30, - 2, 62, :_reduce_31, - 2, 62, :_reduce_32, - 2, 62, :_reduce_33, - 2, 62, :_reduce_34, - 2, 62, :_reduce_35, - 2, 62, :_reduce_36, - 2, 62, :_reduce_37, - 2, 62, :_reduce_38, - 2, 62, :_reduce_39, - 0, 57, :_reduce_40, - 3, 57, :_reduce_41, - 1, 63, :_reduce_42, - 1, 63, :_reduce_43, - 2, 63, :_reduce_44, - 2, 63, :_reduce_45, - 2, 63, :_reduce_46, - 0, 60, :_reduce_47, - 3, 60, :_reduce_48, - 2, 64, :_reduce_49, - 2, 64, :_reduce_50, - 2, 64, :_reduce_51, - 2, 64, :_reduce_52, - 3, 65, :_reduce_53, - 2, 66, :_reduce_54, - 1, 66, :_reduce_55, - 0, 58, :_reduce_56, - 3, 58, :_reduce_57, - 2, 67, :_reduce_58, - 2, 67, :_reduce_59 ] + 3, 76, :_reduce_1, + 0, 77, :_reduce_2, + 4, 77, :_reduce_3, + 0, 80, :_reduce_4, + 3, 80, :_reduce_5, + 2, 81, :_reduce_6, + 1, 81, :_reduce_7, + 2, 81, :_reduce_8, + 2, 81, :_reduce_9, + 0, 78, :_reduce_10, + 4, 78, :_reduce_11, + 0, 82, :_reduce_12, + 2, 82, :_reduce_13, + 3, 83, :_reduce_14, + 4, 83, :_reduce_15, + 4, 83, :_reduce_16, + 4, 83, :_reduce_17, + 4, 83, :_reduce_18, + 0, 79, :_reduce_19, + 2, 79, :_reduce_20, + 5, 89, :_reduce_21, + 1, 90, :_reduce_22, + 0, 91, :_reduce_23, + 3, 91, :_reduce_24, + 2, 91, :_reduce_25, + 2, 92, :_reduce_26, + 2, 92, :_reduce_27, + 2, 92, :_reduce_28, + 2, 92, :_reduce_29, + 3, 93, :_reduce_30, + 4, 93, :_reduce_31, + 4, 93, :_reduce_32, + 4, 93, :_reduce_33, + 4, 93, :_reduce_34, + 5, 93, :_reduce_35, + 1, 95, :_reduce_36, + 0, 84, :_reduce_37, + 3, 84, :_reduce_38, + 2, 97, :_reduce_39, + 2, 97, :_reduce_40, + 2, 97, :_reduce_41, + 2, 97, :_reduce_42, + 2, 97, :_reduce_43, + 2, 97, :_reduce_44, + 2, 97, :_reduce_45, + 2, 97, :_reduce_46, + 2, 97, :_reduce_47, + 0, 85, :_reduce_48, + 3, 85, :_reduce_49, + 2, 98, :_reduce_50, + 2, 98, :_reduce_51, + 2, 98, :_reduce_52, + 2, 98, :_reduce_53, + 2, 98, :_reduce_54, + 2, 98, :_reduce_55, + 2, 98, :_reduce_56, + 2, 98, :_reduce_57, + 2, 98, :_reduce_58, + 1, 98, :_reduce_59, + 2, 98, :_reduce_60, + 2, 98, :_reduce_61, + 2, 98, :_reduce_62, + 2, 98, :_reduce_63, + 2, 98, :_reduce_64, + 2, 98, :_reduce_65, + 2, 98, :_reduce_66, + 1, 98, :_reduce_67, + 0, 86, :_reduce_68, + 3, 86, :_reduce_69, + 2, 99, :_reduce_70, + 2, 99, :_reduce_71, + 2, 99, :_reduce_72, + 2, 99, :_reduce_73, + 2, 99, :_reduce_74, + 0, 96, :_reduce_75, + 3, 96, :_reduce_76, + 2, 100, :_reduce_77, + 2, 100, :_reduce_78, + 2, 100, :_reduce_79, + 2, 100, :_reduce_80, + 2, 100, :_reduce_81, + 0, 88, :_reduce_82, + 3, 88, :_reduce_83, + 2, 103, :_reduce_84, + 2, 103, :_reduce_85, + 2, 103, :_reduce_86, + 2, 103, :_reduce_87, + 2, 103, :_reduce_88, + 2, 103, :_reduce_89, + 2, 103, :_reduce_90, + 2, 103, :_reduce_91, + 3, 101, :_reduce_92, + 4, 101, :_reduce_93, + 4, 101, :_reduce_94, + 2, 94, :_reduce_95, + 1, 94, :_reduce_96, + 1, 102, :_reduce_97, + 0, 87, :_reduce_98, + 3, 87, :_reduce_99, + 2, 104, :_reduce_100, + 1, 104, :_reduce_101, + 2, 104, :_reduce_102, + 2, 104, :_reduce_103 ] -racc_reduce_n = 60 +racc_reduce_n = 104 -racc_shift_n = 110 +racc_shift_n = 207 racc_action_table = [ - 26, 27, 28, 29, 30, 47, 48, 24, 25, 15, - 16, 2, 77, 78, 79, 80, 20, 13, 21, 22, - 68, 71, 72, 66, 67, 18, 46, 52, 53, 54, - 55, 70, 58, 59, 60, 34, 35, 31, 37, 12, - 81, 14, 56, 57, 74, 75, 62, 38, 40, 41, - 76, 42, 43, 9, 7, 63, 64, 65, 5, 19, - 4, 83, 84, 85, 86, 87, 88, 89, 90, 91, - 92, 93, 94, 95, 96, 97, 98, 99, 100, 102, - 103, 105, 106, 107, 108, 109 ] + 59, 62, 64, 66, 67, 200, 68, 166, 56, 57, + 58, 24, 25, 28, 29, 38, 20, 39, 192, 35, + 34, 33, 17, 183, 184, 186, 188, 48, 50, 32, + 99, 100, 101, 60, 48, 50, 113, 115, 102, 103, + 104, 15, 16, 23, 105, 120, 121, 44, 45, 47, + 49, 51, 53, 43, 44, 45, 47, 49, 51, 53, + 43, 106, 201, 109, 111, 112, 120, 121, 65, 107, + 187, 191, 108, 31, 30, 122, 123, 124, 27, 19, + 114, 175, 116, 117, 189, 126, 128, 182, 46, 94, + 97, 79, 80, 129, 84, 86, 88, 130, 132, 133, + 134, 96, 135, 116, 117, 136, 137, 138, 119, 139, + 140, 141, 142, 143, 81, 82, 83, 85, 87, 89, + 91, 92, 93, 95, 94, 97, 79, 80, 144, 84, + 86, 88, 145, 113, 115, 146, 96, 147, 148, 149, + 150, 90, 151, 152, 153, 154, 155, 156, 157, 81, + 82, 83, 85, 87, 89, 91, 92, 93, 95, 158, + 109, 111, 112, 159, 160, 70, 72, 73, 75, 76, + 77, 78, 69, 161, 162, 163, 180, 181, 179, 70, + 72, 73, 75, 76, 77, 78, 69, 164, 165, 36, + 167, 168, 74, 169, 170, 171, 172, 22, 2, 13, + 11, 9, 7, 6, 193, 194, 195, 197, 124, 199, + 5, 202, 203, 204, 205, 206 ] racc_action_check = [ - 23, 23, 23, 23, 23, 39, 39, 23, 23, 8, - 8, 0, 51, 51, 51, 51, 12, 8, 13, 17, - 49, 49, 49, 49, 49, 9, 39, 44, 44, 44, - 44, 49, 44, 44, 44, 24, 25, 23, 26, 8, - 51, 8, 44, 44, 50, 50, 44, 27, 29, 30, - 50, 32, 36, 6, 4, 45, 47, 48, 2, 11, - 1, 52, 53, 54, 55, 56, 57, 58, 59, 60, - 61, 66, 67, 69, 72, 73, 74, 75, 77, 78, - 79, 80, 82, 100, 105, 107 ] + 40, 40, 40, 40, 40, 192, 40, 115, 40, 40, + 40, 14, 14, 14, 14, 28, 10, 29, 183, 23, + 21, 18, 10, 178, 178, 178, 178, 131, 131, 17, + 43, 44, 45, 40, 37, 37, 54, 54, 47, 48, + 49, 10, 10, 14, 50, 177, 177, 131, 131, 131, + 131, 131, 131, 131, 37, 37, 37, 37, 37, 37, + 37, 51, 192, 54, 54, 54, 55, 55, 40, 52, + 178, 183, 53, 16, 15, 56, 57, 58, 14, 10, + 54, 131, 177, 177, 178, 59, 60, 177, 37, 42, + 42, 42, 42, 61, 42, 42, 42, 62, 66, 67, + 68, 42, 69, 55, 55, 70, 71, 72, 55, 73, + 75, 76, 77, 78, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 174, 174, 174, 174, 79, 174, + 174, 174, 80, 176, 176, 81, 174, 83, 84, 85, + 86, 42, 87, 88, 89, 91, 92, 93, 94, 174, + 174, 174, 174, 174, 174, 174, 174, 174, 174, 96, + 176, 176, 176, 97, 98, 173, 173, 173, 173, 173, + 173, 173, 173, 109, 110, 111, 174, 176, 173, 41, + 41, 41, 41, 41, 41, 41, 41, 112, 113, 24, + 117, 118, 41, 120, 121, 124, 127, 13, 0, 8, + 7, 5, 3, 2, 184, 185, 186, 187, 188, 191, + 1, 199, 200, 201, 202, 203 ] racc_action_pointer = [ - 9, 60, 18, nil, 54, nil, 50, nil, 0, 6, - nil, 17, -3, -1, nil, nil, nil, -21, nil, nil, - nil, nil, nil, -4, 16, 17, 19, 7, nil, 8, - 9, nil, 9, nil, nil, nil, 12, nil, nil, -15, - nil, nil, nil, nil, 5, 13, nil, 37, 38, -10, - 9, -1, 42, 43, 44, 45, 46, 47, 48, 49, - 50, 28, nil, nil, nil, nil, 52, 53, nil, 31, - nil, nil, 55, 33, 57, 58, nil, 59, 60, 61, - 62, nil, 40, nil, nil, nil, nil, nil, nil, nil, + 196, 174, 132, 202, nil, 130, nil, 200, 196, nil, + 7, nil, nil, 180, 6, 57, 56, 12, -52, nil, + nil, -51, nil, -52, 118, nil, nil, nil, -56, -54, + nil, nil, nil, nil, nil, nil, nil, 16, nil, nil, + -4, 120, 69, 13, 14, 15, nil, 21, 22, 23, + 27, 44, -4, 55, 8, 36, 58, 59, 60, 68, + 15, 20, 26, nil, nil, nil, 27, 28, 83, 85, + 88, 33, 90, 92, nil, 93, 94, 95, 96, 111, + 115, 118, nil, 120, 121, 122, 123, 125, 126, 127, + nil, 128, 129, 130, 131, nil, 142, 146, 91, nil, + nil, nil, nil, nil, nil, nil, nil, nil, nil, 156, + 101, 158, 170, 171, nil, -10, nil, 173, 118, nil, + 176, 177, nil, nil, 178, nil, nil, 125, nil, nil, + nil, 9, nil, nil, nil, nil, nil, nil, nil, nil, + nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, - 40, nil, nil, nil, nil, 65, nil, 66, nil, nil ] + nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, + nil, nil, nil, 106, 104, nil, 105, 15, 12, nil, + nil, nil, nil, 1, 187, 132, 189, 190, 191, nil, + nil, 140, -12, nil, nil, nil, nil, nil, nil, 137, + 138, 196, 197, 198, nil, nil, nil ] racc_action_default = [ - -2, -60, -60, -10, -60, -4, -1, 110, -60, -60, - -11, -60, -60, -60, -3, -6, -7, -60, -13, -5, - -9, -8, -14, -60, -60, -60, -60, -60, -25, -60, - -60, -12, -60, -16, -17, -18, -60, -24, -29, -60, - -40, -56, -15, -47, -60, -60, -19, -60, -60, -60, - -60, -60, -60, -60, -60, -60, -60, -60, -60, -60, - -60, -60, -20, -26, -27, -28, -60, -60, -42, -60, - -21, -43, -60, -60, -60, -60, -22, -60, -60, -60, - -60, -23, -60, -31, -32, -33, -34, -38, -39, -35, - -36, -37, -30, -45, -46, -41, -44, -57, -58, -59, - -60, -51, -49, -50, -52, -55, -48, -60, -54, -53 ] + -2, -10, -104, -104, -19, -104, -4, -104, -1, -12, + -104, 207, -20, -104, -104, -104, -104, -104, -104, -3, + -7, -104, -22, -104, -104, -37, -13, -11, -104, -104, + -9, -6, -8, -5, -23, -82, -48, -104, -68, -98, + -104, -104, -104, -104, -104, -104, -14, -104, -104, -104, + -104, -104, -104, -104, -104, -104, -104, -104, -104, -104, + -104, -104, -104, -25, -37, -21, -104, -104, -104, -104, + -104, -104, -104, -104, -18, -104, -104, -104, -104, -104, + -104, -104, -59, -104, -104, -104, -104, -104, -104, -104, + -15, -104, -104, -104, -104, -67, -104, -104, -104, -47, + -41, -42, -43, -39, -44, -40, -45, -38, -46, -104, + -104, -104, -104, -104, -16, -104, -101, -104, -104, -17, + -104, -104, -29, -27, -96, -28, -36, -104, -82, -24, + -48, -104, -68, -98, -26, -91, -84, -83, -85, -86, + -87, -88, -89, -90, -52, -54, -53, -60, -55, -61, + -56, -62, -57, -63, -64, -65, -66, -50, -58, -51, + -49, -71, -69, -72, -73, -70, -74, -102, -99, -100, + -103, -95, -75, -104, -104, -30, -104, -104, -104, -34, + -31, -32, -33, -104, -104, -104, -104, -104, -104, -35, + -79, -104, -104, -77, -76, -78, -81, -97, -80, -104, + -104, -104, -104, -104, -92, -93, -94 ] racc_goto_table = [ - 1, 3, 6, 8, 11, 10, 17, 23, 32, 33, - 39, 44, 49, 50, 36, 51, 45, 61, 69, 82, - 101, 104, 73 ] + 125, 55, 54, 42, 37, 41, 3, 26, 18, 10, + 8, 4, 14, 12, 21, 40, 61, 63, 1, 127, + 178, 185, 190, 196, nil, nil, nil, nil, nil, nil, + nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, + nil, nil, nil, 131, nil, nil, nil, nil, nil, nil, + nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, + nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, + nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, + nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, + nil, nil, nil, nil, nil, 177, 176, 174, 173, nil, + nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, + nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, + nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, + 198 ] racc_goto_check = [ - 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, - 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, - 21, 22, 23 ] + 19, 12, 11, 10, 9, 13, 1, 8, 6, 5, + 4, 3, 7, 14, 15, 16, 17, 18, 2, 20, + 21, 25, 26, 27, nil, nil, nil, nil, nil, nil, + nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, + nil, nil, nil, 9, nil, nil, nil, nil, nil, nil, + nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, + nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, + nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, + nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, + nil, nil, nil, nil, nil, 12, 11, 10, 13, nil, + nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, + nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, + nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, + 19 ] racc_goto_pointer = [ - nil, 0, 1, -1, -2, -4, -1, -3, -15, -15, - -14, -18, -27, -28, -28, -12, -28, -23, -27, -31, - -32, -57, -59, -28 ] + nil, 6, 18, 10, 6, 3, -2, 3, -7, -21, + -33, -36, -38, -30, 5, 1, -19, -24, -23, -58, + -40, -152, nil, nil, nil, -157, -161, -164, nil, nil ] racc_goto_default = [ nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, - nil, nil, nil, nil ] + nil, nil, 52, 98, 110, nil, nil, nil, 71, 118 ] racc_token_table = { false => 0, @@ -256,45 +436,76 @@ :TK_DISK_S => 6, :TK_SYNCER => 7, :TK_STARTUP => 8, - :TK_DISABLE_IO_HINTS => 9, - :TK_DISABLE_IP_VERIFICATION => 10, - :TK_PROTOCOL => 11, - :TK_INCON_DEGR_CMD => 12, - :TK_ADDRESS => 13, - :TK_DISK => 14, - :TK_DEVICE => 15, - :TK_META_DISK => 16, - :TK_MINOR_COUNT => 17, - :TK_INTEGER => 18, - :TK_STRING => 19, - :TK_ON_IO_ERROR => 20, - :TK_SIZE => 21, - :TK_TIMEOUT => 22, - :TK_CONNECT_INT => 23, - :TK_PING_INT => 24, - :TK_MAX_BUFFERS => 25, - :TK_IPADDR => 26, - :TK_UNPLUG_WATERMARK => 27, - :TK_MAX_EPOCH_SIZE => 28, - :TK_SNDBUF_SIZE => 29, - :TK_SKIP_SYNC => 30, - :TK_USE_CSUMS => 31, - :TK_RATE => 32, - :TK_SYNC_GROUP => 33, - :TK_AL_EXTENTS => 34, - :TK_WFC_TIMEOUT => 35, - :TK_DEGR_WFC_TIMEOUT => 36, - :TK_KO_COUNT => 37, - :TK_ON_DISCONNECT => 38, - :TK_DIALOG_REFRESH => 39, - "{" => 40, - "}" => 41, - ";" => 42, - ":" => 43 } + :TK_DISABLE_IP_VERIFICATION => 9, + :TK_PROTOCOL => 10, + :TK_ADDRESS => 11, + :TK_DISK => 12, + :TK_DEVICE => 13, + :TK_META_DISK => 14, + :TK_MINOR_COUNT => 15, + :TK_INTEGER => 16, + :TK_STRING => 17, + :TK_ON_IO_ERROR => 18, + :TK_SIZE => 19, + :TK_TIMEOUT => 20, + :TK_CONNECT_INT => 21, + :TK_PING_INT => 22, + :TK_MAX_BUFFERS => 23, + :TK_IPADDR => 24, + :TK_UNPLUG_WATERMARK => 25, + :TK_MAX_EPOCH_SIZE => 26, + :TK_SNDBUF_SIZE => 27, + :TK_RATE => 28, + :TK_AL_EXTENTS => 29, + :TK_WFC_TIMEOUT => 30, + :TK_DEGR_WFC_TIMEOUT => 31, + :TK_KO_COUNT => 32, + :TK_ON_DISCONNECT => 33, + :TK_DIALOG_REFRESH => 34, + :TK_USAGE_COUNT => 35, + :TK_COMMON => 36, + :TK_HANDLERS => 37, + :TK_FENCING => 38, + :TK_USE_BMBV => 39, + :TK_NO_DISK_BARRIER => 40, + :TK_NO_DISK_FLUSHES => 41, + :TK_NO_DISK_DRAIN => 42, + :TK_NO_MD_FLUSHES => 43, + :TK_MAX_BIO_BVECS => 44, + :TK_PINT_TIMEOUT => 45, + :TK_ALLOW_TWO_PRIMARIES => 46, + :TK_CRAM_HMAC_ALG => 47, + :TK_SHARED_SECRET => 48, + :TK_AFTER_SB_0PRI => 49, + :TK_AFTER_SB_1PRI => 50, + :TK_AFTER_SB_2PRI => 51, + :TK_DATA_INTEGRITY_ALG => 52, + :TK_RR_CONFLICT => 53, + :TK_NO_TCP_CORK => 54, + :TK_CPU_MASK => 55, + :TK_VERIFY_ALG => 56, + :TK_AFTER => 57, + :TK_FLEXIBLE_META_DISK => 58, + :TK_PRI_ON_INCON_DEGR => 59, + :TK_PRI_LOST_AFTER_SB => 60, + :TK_PRI_LOST => 61, + :TK_OUTDATE_PEER => 62, + :TK_LOCAL_IO_ERROR => 63, + :TK_SPLIT_BRAIN => 64, + :TK_BEFORE_RESYNC_TARGET => 65, + :TK_AFTER_RESYNC_TARGET => 66, + :TK_WAIT_AFTER_SB => 67, + :TK_BECOME_PRIMARY_ON => 68, + :TK_IPV6ADDR => 69, + :TK_IPV6 => 70, + "{" => 71, + "}" => 72, + ";" => 73, + ":" => 74 } racc_use_result_var = true -racc_nt_base = 44 +racc_nt_base = 75 Racc_arg = [ racc_action_table, @@ -322,10 +533,8 @@ 'TK_DISK_S', 'TK_SYNCER', 'TK_STARTUP', -'TK_DISABLE_IO_HINTS', 'TK_DISABLE_IP_VERIFICATION', 'TK_PROTOCOL', -'TK_INCON_DEGR_CMD', 'TK_ADDRESS', 'TK_DISK', 'TK_DEVICE', @@ -343,16 +552,49 @@ 'TK_UNPLUG_WATERMARK', 'TK_MAX_EPOCH_SIZE', 'TK_SNDBUF_SIZE', -'TK_SKIP_SYNC', -'TK_USE_CSUMS', 'TK_RATE', -'TK_SYNC_GROUP', 'TK_AL_EXTENTS', 'TK_WFC_TIMEOUT', 'TK_DEGR_WFC_TIMEOUT', 'TK_KO_COUNT', 'TK_ON_DISCONNECT', 'TK_DIALOG_REFRESH', +'TK_USAGE_COUNT', +'TK_COMMON', +'TK_HANDLERS', +'TK_FENCING', +'TK_USE_BMBV', +'TK_NO_DISK_BARRIER', +'TK_NO_DISK_FLUSHES', +'TK_NO_DISK_DRAIN', +'TK_NO_MD_FLUSHES', +'TK_MAX_BIO_BVECS', +'TK_PINT_TIMEOUT', +'TK_ALLOW_TWO_PRIMARIES', +'TK_CRAM_HMAC_ALG', +'TK_SHARED_SECRET', +'TK_AFTER_SB_0PRI', +'TK_AFTER_SB_1PRI', +'TK_AFTER_SB_2PRI', +'TK_DATA_INTEGRITY_ALG', +'TK_RR_CONFLICT', +'TK_NO_TCP_CORK', +'TK_CPU_MASK', +'TK_VERIFY_ALG', +'TK_AFTER', +'TK_FLEXIBLE_META_DISK', +'TK_PRI_ON_INCON_DEGR', +'TK_PRI_LOST_AFTER_SB', +'TK_PRI_LOST', +'TK_OUTDATE_PEER', +'TK_LOCAL_IO_ERROR', +'TK_SPLIT_BRAIN', +'TK_BEFORE_RESYNC_TARGET', +'TK_AFTER_RESYNC_TARGET', +'TK_WAIT_AFTER_SB', +'TK_BECOME_PRIMARY_ON', +'TK_IPV6ADDR', +'TK_IPV6', '"{"', '"}"', '";"', @@ -360,18 +602,23 @@ '$start', 'config', 'global_sec', +'common_sec', 'resources', 'glob_stmts', 'glob_stmt', +'common_stmts', +'common_stmt', +'disk_stmts', +'net_stmts', +'sync_stmts', +'startup_stmts', +'handlers_stmts', 'resource', 'resource_name', 'res_stmts', 'res_stmt', 'section', -'disk_stmts', -'net_stmts', -'sync_stmts', -'startup_stmts', +'meta_disk_and_index', 'hostname', 'host_stmts', 'disk_stmt', @@ -379,7 +626,8 @@ 'sync_stmt', 'host_stmt', 'ip_and_port', -'meta_disk_and_index', +'flexible_meta_disk', +'handlers_stmt', 'startup_stmt'] Racc_debug_parser = true @@ -390,7 +638,7 @@ module_eval <<'.,.,', 'drbd.rb.yy', 6 def _reduce_1( val, _values, result ) - $drbd['global'] = val[0]; $drbd['resources'] = val[1]; return $drbd; + $drbd['global'] = val[0]; $drbd['common'] = val[1]; $drbd['resources'] = val[2]; return $drbd; result end .,., @@ -425,7 +673,7 @@ module_eval <<'.,.,', 'drbd.rb.yy', 12 def _reduce_6( val, _values, result ) - return ["#{val[0]}", true]; + return ["#{val[0]}", val[1]]; result end .,., @@ -460,203 +708,203 @@ module_eval <<'.,.,', 'drbd.rb.yy', 18 def _reduce_11( val, _values, result ) - nk = val[1][0]; val[0][nk] = val[1][1]; return val[0]; + return val[2]; result end .,., -module_eval <<'.,.,', 'drbd.rb.yy', 20 +module_eval <<'.,.,', 'drbd.rb.yy', 19 def _reduce_12( val, _values, result ) - return ["#{val[1]}", val[3]]; + return {}; result end .,., -module_eval <<'.,.,', 'drbd.rb.yy', 22 +module_eval <<'.,.,', 'drbd.rb.yy', 20 def _reduce_13( val, _values, result ) - return val[0]; + nk = val[1][0]; val[0][nk] = val[1][1]; return val[0]; result end .,., -module_eval <<'.,.,', 'drbd.rb.yy', 24 +module_eval <<'.,.,', 'drbd.rb.yy', 22 def _reduce_14( val, _values, result ) - return {}; + return ["#{val[0]}", val[1]]; result end .,., -module_eval <<'.,.,', 'drbd.rb.yy', 25 +module_eval <<'.,.,', 'drbd.rb.yy', 23 def _reduce_15( val, _values, result ) - nk = val[1][0]; val[0][nk] = val[1][1]; return val[0]; + return ["#{val[0]}", val[2]]; result end .,., -module_eval <<'.,.,', 'drbd.rb.yy', 33 +module_eval <<'.,.,', 'drbd.rb.yy', 24 def _reduce_16( val, _values, result ) -nk = val[1][0]; - if nk == "on" then - if (!val[0]["on"]) then val[0]["on"] = {}; end - val[0]["on"][val[1][1]] = val[1][2]; - else - val[0][nk] = val[1][1]; - end - return val[0]; + return ["#{val[0]}", val[2]]; result end .,., -module_eval <<'.,.,', 'drbd.rb.yy', 35 +module_eval <<'.,.,', 'drbd.rb.yy', 25 def _reduce_17( val, _values, result ) - return ["#{val[0]}", val[1]]; + return ["#{val[0]}", val[2]]; result end .,., -module_eval <<'.,.,', 'drbd.rb.yy', 36 +module_eval <<'.,.,', 'drbd.rb.yy', 26 def _reduce_18( val, _values, result ) - return ["#{val[0]}", val[1]]; + return ["#{val[0]}", val[2]]; result end .,., -module_eval <<'.,.,', 'drbd.rb.yy', 38 +module_eval <<'.,.,', 'drbd.rb.yy', 28 def _reduce_19( val, _values, result ) - return ["#{val[0]}", val[1]]; + return {}; result end .,., -module_eval <<'.,.,', 'drbd.rb.yy', 39 +module_eval <<'.,.,', 'drbd.rb.yy', 29 def _reduce_20( val, _values, result ) - return ["#{val[0]}", val[2]]; + nk = val[1][0]; val[0][nk] = val[1][1]; return val[0]; result end .,., -module_eval <<'.,.,', 'drbd.rb.yy', 40 +module_eval <<'.,.,', 'drbd.rb.yy', 31 def _reduce_21( val, _values, result ) - return ["#{val[0]}", val[2]]; + return ["#{val[1]}", val[3]]; result end .,., -module_eval <<'.,.,', 'drbd.rb.yy', 41 +module_eval <<'.,.,', 'drbd.rb.yy', 33 def _reduce_22( val, _values, result ) - return ["#{val[0]}", val[2]]; + return val[0]; result end .,., -module_eval <<'.,.,', 'drbd.rb.yy', 42 +module_eval <<'.,.,', 'drbd.rb.yy', 35 def _reduce_23( val, _values, result ) - return ["#{val[0]}", "#{val[1]}", val[3]]; + return {}; result end .,., -module_eval <<'.,.,', 'drbd.rb.yy', 44 +module_eval <<'.,.,', 'drbd.rb.yy', 36 def _reduce_24( val, _values, result ) - return val[0]; + nk = val[1][0]; val[0][nk] = val[1][1]; return val[0]; result end .,., -module_eval <<'.,.,', 'drbd.rb.yy', 46 +module_eval <<'.,.,', 'drbd.rb.yy', 44 def _reduce_25( val, _values, result ) - return {}; +nk = val[1][0]; + if nk == "on" then + if (!val[0]["on"]) then val[0]["on"] = {}; end + val[0]["on"][val[1][1]] = val[1][2]; + else + val[0][nk] = val[1][1]; + end + return val[0]; result end .,., -module_eval <<'.,.,', 'drbd.rb.yy', 47 +module_eval <<'.,.,', 'drbd.rb.yy', 46 def _reduce_26( val, _values, result ) - nk = val[1][0]; val[0][nk] = val[1][1]; return val[0]; + return ["#{val[0]}", val[1]]; result end .,., -module_eval <<'.,.,', 'drbd.rb.yy', 49 +module_eval <<'.,.,', 'drbd.rb.yy', 47 def _reduce_27( val, _values, result ) return ["#{val[0]}", val[1]]; result end .,., -module_eval <<'.,.,', 'drbd.rb.yy', 50 +module_eval <<'.,.,', 'drbd.rb.yy', 48 def _reduce_28( val, _values, result ) return ["#{val[0]}", val[1]]; result end .,., -module_eval <<'.,.,', 'drbd.rb.yy', 52 +module_eval <<'.,.,', 'drbd.rb.yy', 49 def _reduce_29( val, _values, result ) - return {}; + return ["#{val[0]}", val[1]]; result end .,., -module_eval <<'.,.,', 'drbd.rb.yy', 53 +module_eval <<'.,.,', 'drbd.rb.yy', 51 def _reduce_30( val, _values, result ) - nk = val[1][0]; val[0][nk] = val[1][1]; return val[0]; + return ["#{val[0]}", val[1]]; result end .,., -module_eval <<'.,.,', 'drbd.rb.yy', 55 +module_eval <<'.,.,', 'drbd.rb.yy', 52 def _reduce_31( val, _values, result ) - return ["#{val[0]}", val[1]]; + return ["#{val[0]}", val[2]]; result end .,., -module_eval <<'.,.,', 'drbd.rb.yy', 56 +module_eval <<'.,.,', 'drbd.rb.yy', 53 def _reduce_32( val, _values, result ) - return ["#{val[0]}", val[1]]; + return ["#{val[0]}", val[2]]; result end .,., -module_eval <<'.,.,', 'drbd.rb.yy', 57 +module_eval <<'.,.,', 'drbd.rb.yy', 54 def _reduce_33( val, _values, result ) - return ["#{val[0]}", val[1]]; + return ["#{val[0]}", val[2]]; result end .,., -module_eval <<'.,.,', 'drbd.rb.yy', 58 +module_eval <<'.,.,', 'drbd.rb.yy', 55 def _reduce_34( val, _values, result ) - return ["#{val[0]}", val[1]]; + return ["#{val[0]}", val[2]]; result end .,., -module_eval <<'.,.,', 'drbd.rb.yy', 59 +module_eval <<'.,.,', 'drbd.rb.yy', 56 def _reduce_35( val, _values, result ) - return ["#{val[0]}", val[1]]; + return ["#{val[0]}", "#{val[1]}", val[3]]; result end .,., -module_eval <<'.,.,', 'drbd.rb.yy', 60 +module_eval <<'.,.,', 'drbd.rb.yy', 58 def _reduce_36( val, _values, result ) - return ["#{val[0]}", val[1]]; + return val[0]; result end .,., -module_eval <<'.,.,', 'drbd.rb.yy', 61 +module_eval <<'.,.,', 'drbd.rb.yy', 60 def _reduce_37( val, _values, result ) - return ["#{val[0]}", val[1]]; + return {}; result end .,., -module_eval <<'.,.,', 'drbd.rb.yy', 62 +module_eval <<'.,.,', 'drbd.rb.yy', 61 def _reduce_38( val, _values, result ) - return ["#{val[0]}", val[1]]; + nk = val[1][0]; val[0][nk] = val[1][1]; return val[0]; result end .,., @@ -668,141 +916,449 @@ end .,., -module_eval <<'.,.,', 'drbd.rb.yy', 65 +module_eval <<'.,.,', 'drbd.rb.yy', 64 def _reduce_40( val, _values, result ) - return {}; + return ["#{val[0]}", val[1]]; result end .,., -module_eval <<'.,.,', 'drbd.rb.yy', 66 +module_eval <<'.,.,', 'drbd.rb.yy', 65 def _reduce_41( val, _values, result ) - nk = val[1][0]; val[0][nk] = val[1][1]; return val[0]; + return ["#{val[0]}", val[1]]; result end .,., -module_eval <<'.,.,', 'drbd.rb.yy', 68 +module_eval <<'.,.,', 'drbd.rb.yy', 66 def _reduce_42( val, _values, result ) - return ["#{val[0]}", true]; + return ["#{val[0]}", val[1]]; result end .,., -module_eval <<'.,.,', 'drbd.rb.yy', 69 +module_eval <<'.,.,', 'drbd.rb.yy', 67 def _reduce_43( val, _values, result ) - return ["#{val[0]}", true]; + return ["#{val[0]}", val[1]]; result end .,., -module_eval <<'.,.,', 'drbd.rb.yy', 70 +module_eval <<'.,.,', 'drbd.rb.yy', 68 def _reduce_44( val, _values, result ) return ["#{val[0]}", val[1]]; result end .,., -module_eval <<'.,.,', 'drbd.rb.yy', 71 +module_eval <<'.,.,', 'drbd.rb.yy', 69 def _reduce_45( val, _values, result ) return ["#{val[0]}", val[1]]; result end .,., -module_eval <<'.,.,', 'drbd.rb.yy', 72 +module_eval <<'.,.,', 'drbd.rb.yy', 70 def _reduce_46( val, _values, result ) return ["#{val[0]}", val[1]]; result end .,., -module_eval <<'.,.,', 'drbd.rb.yy', 74 +module_eval <<'.,.,', 'drbd.rb.yy', 71 def _reduce_47( val, _values, result ) - return {}; + return ["#{val[0]}", val[1]]; result end .,., -module_eval <<'.,.,', 'drbd.rb.yy', 75 +module_eval <<'.,.,', 'drbd.rb.yy', 73 def _reduce_48( val, _values, result ) + return {}; + result + end +.,., + +module_eval <<'.,.,', 'drbd.rb.yy', 74 + def _reduce_49( val, _values, result ) nk = val[1][0]; val[0][nk] = val[1][1]; return val[0]; result end .,., +module_eval <<'.,.,', 'drbd.rb.yy', 76 + def _reduce_50( val, _values, result ) + return ["#{val[0]}", val[1]]; + result + end +.,., + module_eval <<'.,.,', 'drbd.rb.yy', 77 - def _reduce_49( val, _values, result ) + def _reduce_51( val, _values, result ) return ["#{val[0]}", val[1]]; result end .,., module_eval <<'.,.,', 'drbd.rb.yy', 78 - def _reduce_50( val, _values, result ) + def _reduce_52( val, _values, result ) return ["#{val[0]}", val[1]]; result end .,., module_eval <<'.,.,', 'drbd.rb.yy', 79 - def _reduce_51( val, _values, result ) + def _reduce_53( val, _values, result ) return ["#{val[0]}", val[1]]; result end .,., module_eval <<'.,.,', 'drbd.rb.yy', 80 - def _reduce_52( val, _values, result ) + def _reduce_54( val, _values, result ) + return ["#{val[0]}", val[1]]; + result + end +.,., + +module_eval <<'.,.,', 'drbd.rb.yy', 81 + def _reduce_55( val, _values, result ) return ["#{val[0]}", val[1]]; result end .,., module_eval <<'.,.,', 'drbd.rb.yy', 82 - def _reduce_53( val, _values, result ) - return "#{val[0]}:#{val[2]}"; + def _reduce_56( val, _values, result ) + return ["#{val[0]}", val[1]]; + result + end +.,., + +module_eval <<'.,.,', 'drbd.rb.yy', 83 + def _reduce_57( val, _values, result ) + return ["#{val[0]}", val[1]]; result end .,., module_eval <<'.,.,', 'drbd.rb.yy', 84 - def _reduce_54( val, _values, result ) - return "#{val[0]} #{val[1]}"; + def _reduce_58( val, _values, result ) + return ["#{val[0]}", val[1]]; result end .,., module_eval <<'.,.,', 'drbd.rb.yy', 85 - def _reduce_55( val, _values, result ) - return val[0]; + def _reduce_59( val, _values, result ) + return ["#{val[0]}", true]; + result + end +.,., + +module_eval <<'.,.,', 'drbd.rb.yy', 86 + def _reduce_60( val, _values, result ) + return ["#{val[0]}", val[1]]; result end .,., module_eval <<'.,.,', 'drbd.rb.yy', 87 - def _reduce_56( val, _values, result ) - return {}; + def _reduce_61( val, _values, result ) + return ["#{val[0]}", val[1]]; result end .,., module_eval <<'.,.,', 'drbd.rb.yy', 88 - def _reduce_57( val, _values, result ) - nk = val[1][0]; val[0][nk] = val[1][1]; return val[0]; + def _reduce_62( val, _values, result ) + return ["#{val[0]}", val[1]]; + result + end +.,., + +module_eval <<'.,.,', 'drbd.rb.yy', 89 + def _reduce_63( val, _values, result ) + return ["#{val[0]}", val[1]]; result end .,., module_eval <<'.,.,', 'drbd.rb.yy', 90 - def _reduce_58( val, _values, result ) + def _reduce_64( val, _values, result ) return ["#{val[0]}", val[1]]; result end .,., module_eval <<'.,.,', 'drbd.rb.yy', 91 - def _reduce_59( val, _values, result ) + def _reduce_65( val, _values, result ) + return ["#{val[0]}", val[1]]; + result + end +.,., + +module_eval <<'.,.,', 'drbd.rb.yy', 92 + def _reduce_66( val, _values, result ) + return ["#{val[0]}", val[1]]; + result + end +.,., + +module_eval <<'.,.,', 'drbd.rb.yy', 93 + def _reduce_67( val, _values, result ) + return ["#{val[0]}", true]; + result + end +.,., + +module_eval <<'.,.,', 'drbd.rb.yy', 95 + def _reduce_68( val, _values, result ) + return {}; + result + end +.,., + +module_eval <<'.,.,', 'drbd.rb.yy', 96 + def _reduce_69( val, _values, result ) + nk = val[1][0]; val[0][nk] = val[1][1]; return val[0]; + result + end +.,., + +module_eval <<'.,.,', 'drbd.rb.yy', 98 + def _reduce_70( val, _values, result ) + return ["#{val[0]}", val[1]]; + result + end +.,., + +module_eval <<'.,.,', 'drbd.rb.yy', 99 + def _reduce_71( val, _values, result ) + return ["#{val[0]}", vavl[1]]; + result + end +.,., + +module_eval <<'.,.,', 'drbd.rb.yy', 100 + def _reduce_72( val, _values, result ) + return ["#{val[0]}", val[1]]; + result + end +.,., + +module_eval <<'.,.,', 'drbd.rb.yy', 101 + def _reduce_73( val, _values, result ) + return ["#{val[0]}", val[1]]; + result + end +.,., + +module_eval <<'.,.,', 'drbd.rb.yy', 102 + def _reduce_74( val, _values, result ) + return ["#{val[0]}", val[1]]; + result + end +.,., + +module_eval <<'.,.,', 'drbd.rb.yy', 104 + def _reduce_75( val, _values, result ) + return {}; + result + end +.,., + +module_eval <<'.,.,', 'drbd.rb.yy', 105 + def _reduce_76( val, _values, result ) + nk = val[1][0]; val[0][nk] = val[1][1]; return val[0]; + result + end +.,., + +module_eval <<'.,.,', 'drbd.rb.yy', 107 + def _reduce_77( val, _values, result ) + return ["#{val[0]}", val[1]]; + result + end +.,., + +module_eval <<'.,.,', 'drbd.rb.yy', 108 + def _reduce_78( val, _values, result ) + return ["#{val[0]}", val[1]]; + result + end +.,., + +module_eval <<'.,.,', 'drbd.rb.yy', 109 + def _reduce_79( val, _values, result ) + return ["#{val[0]}", val[1]]; + result + end +.,., + +module_eval <<'.,.,', 'drbd.rb.yy', 110 + def _reduce_80( val, _values, result ) + return ["#{val[0]}", val[1]]; + result + end +.,., + +module_eval <<'.,.,', 'drbd.rb.yy', 111 + def _reduce_81( val, _values, result ) + return ["#{val[0]}", val[1]]; + result + end +.,., + +module_eval <<'.,.,', 'drbd.rb.yy', 113 + def _reduce_82( val, _values, result ) + return {}; + result + end +.,., + +module_eval <<'.,.,', 'drbd.rb.yy', 114 + def _reduce_83( val, _values, result ) + nk = val[1][0]; val[0][nk] = val[1][1]; return val[0]; + result + end +.,., + +module_eval <<'.,.,', 'drbd.rb.yy', 116 + def _reduce_84( val, _values, result ) + return ["#{val[0]}", val[1]]; + result + end +.,., + +module_eval <<'.,.,', 'drbd.rb.yy', 117 + def _reduce_85( val, _values, result ) + return ["#{val[0]}", val[1]]; + result + end +.,., + +module_eval <<'.,.,', 'drbd.rb.yy', 118 + def _reduce_86( val, _values, result ) + return ["#{val[0]}", val[1]]; + result + end +.,., + +module_eval <<'.,.,', 'drbd.rb.yy', 119 + def _reduce_87( val, _values, result ) + return ["#{val[0]}", val[1]]; + result + end +.,., + +module_eval <<'.,.,', 'drbd.rb.yy', 120 + def _reduce_88( val, _values, result ) + return ["#{val[0]}", val[1]]; + result + end +.,., + +module_eval <<'.,.,', 'drbd.rb.yy', 121 + def _reduce_89( val, _values, result ) + return ["#{val[0]}", val[1]]; + result + end +.,., + +module_eval <<'.,.,', 'drbd.rb.yy', 122 + def _reduce_90( val, _values, result ) + return ["#{val[0]}", val[1]]; + result + end +.,., + +module_eval <<'.,.,', 'drbd.rb.yy', 123 + def _reduce_91( val, _values, result ) + return ["#{val[0]}", val[1]]; + result + end +.,., + +module_eval <<'.,.,', 'drbd.rb.yy', 125 + def _reduce_92( val, _values, result ) + return "#{val[0]}:#{val[2]}"; + result + end +.,., + +module_eval <<'.,.,', 'drbd.rb.yy', 126 + def _reduce_93( val, _values, result ) + return "#{val[0]} #{val[1]}:#{val[3]}"; + result + end +.,., + +module_eval <<'.,.,', 'drbd.rb.yy', 127 + def _reduce_94( val, _values, result ) + return "#{val[0]} #{val[1]}:#{val[3]}"; + result + end +.,., + +module_eval <<'.,.,', 'drbd.rb.yy', 129 + def _reduce_95( val, _values, result ) + return "#{val[0]} #{val[1]}"; + result + end +.,., + +module_eval <<'.,.,', 'drbd.rb.yy', 130 + def _reduce_96( val, _values, result ) + return val[0]; + result + end +.,., + +module_eval <<'.,.,', 'drbd.rb.yy', 132 + def _reduce_97( val, _values, result ) + return val[0]; + result + end +.,., + +module_eval <<'.,.,', 'drbd.rb.yy', 134 + def _reduce_98( val, _values, result ) + return {}; + result + end +.,., + +module_eval <<'.,.,', 'drbd.rb.yy', 135 + def _reduce_99( val, _values, result ) + nk = val[1][0]; val[0][nk] = val[1][1]; return val[0]; + result + end +.,., + +module_eval <<'.,.,', 'drbd.rb.yy', 137 + def _reduce_100( val, _values, result ) + return ["#{val[0]}", val[1]]; + result + end +.,., + +module_eval <<'.,.,', 'drbd.rb.yy', 138 + def _reduce_101( val, _values, result ) + return ["#{val[0]}", true]; + result + end +.,., + +module_eval <<'.,.,', 'drbd.rb.yy', 139 + def _reduce_102( val, _values, result ) + return ["#{val[0]}", val[1]]; + result + end +.,., + +module_eval <<'.,.,', 'drbd.rb.yy', 140 + def _reduce_103( val, _values, result ) return ["#{val[0]}", val[1]]; result end @@ -820,6 +1376,12 @@ $configstr = "" in_skip = false +if !File.exist?($drbdcfg) + file = File.open($drbdcfg, "w") + file.close +end + + File.open($drbdcfg, "r") do |file| file.each_line do |line| line = line.gsub(/#.*$/, '').chomp @@ -851,7 +1413,7 @@ def doList (path) if path.length == 0 then - puts "[ \"global\", \"resources\" ]" + puts "[ \"global\", \"resources\", \"common\" ]" return end @@ -947,6 +1509,10 @@ errlog path[it]+" is changed to "+path[it].chomp()[1..-2] path[it]=path[it].chomp()[1..-2] end + if path[it] != "" and path[it][0..1] == "\\\"" then + errlog path[it]+" is changed to "+path[it].chomp()[1..-3]+"\"" + path[it]=path[it].chomp()[1..-3]+"\"" + end end if args[0..1] == "\\\"" then @@ -1047,7 +1613,7 @@ if $drbd.has_key?("global") then file.puts "global {" $drbd["global"].each_key do |key| - if key == "disable-ip-verification" or key == "disable-io-hints" then + if key == "disable-ip-verification" then if $drbd["global"][key] == "" or $drbd["global"][key] == "true" then file.puts " "+key+";" end @@ -1057,6 +1623,53 @@ end file.puts "}" end + + if $drbd.has_key?("common") then + file.puts "common {" + + if $drbd["common"].has_key?("disk_s") then + file.puts " disk {" + $drbd["common"]["disk_s"].each_key do |key| + file.puts " "+key+"\t"+$drbd["common"]["disk_s"][key]+";" + end + file.puts " }" + end + + if $drbd["common"].has_key?("syncer") then + file.puts " syncer {" + $drbd["common"]["syncer"].each_key do |key| + file.puts " "+key+"\t"+$drbd["common"]["syncer"][key]+";" + end + file.puts " }" + end + + if $drbd["common"].has_key?("net") then + file.puts " net {" + $drbd["common"]["net"].each_key do |key| + file.puts " "+key+"\t"+$drbd["common"]["net"][key]+";" + end + file.puts " }" + end + + if $drbd["common"].has_key?("startup") then + file.puts " startup {" + $drbd["common"]["startup"].each_key do |key| + file.puts " "+key+"\t"+$drbd["common"]["startup"][key]+";" + end + file.puts " }" + end + + if $drbd["common"].has_key?("handlers") then + file.puts " handlers {" + $drbd["common"]["handlers"].each_key do |key| + file.puts " "+key+"\t"+$drbd["common"]["handlers"][key]+";" + end + file.puts " }" + end + + file.puts "}" + end + if $drbd.has_key?("resources") then $drbd["resources"].each_key do |res_name| file.puts "resource "+res_name+" {" @@ -1064,15 +1677,20 @@ if $drbd["resources"][res_name].has_key?("protocol") then file.puts " protocol\t"+$drbd["resources"][res_name]["protocol"]+";" end - - if $drbd["resources"][res_name].has_key?("incon-degr-cmd") then - file.puts " incon-degr-cmd\t"+$drbd["resources"][res_name]["incon-degr-cmd"]+";" + if $drbd["resources"][res_name].has_key?("device") then + file.puts " device\t"+$drbd["resources"][res_name]["device"]+";" + end + if $drbd["resources"][res_name].has_key?("disk") then + file.puts " disk\t"+$drbd["resources"][res_name]["disk"]+";" + end + if $drbd["resources"][res_name].has_key?("meta-disk") then + file.puts " meta-disk\t"+$drbd["resources"][res_name]["meta-disk"]+";" end - if $drbd["resources"][res_name].has_key?("disk") then + if $drbd["resources"][res_name].has_key?("disk_s") then file.puts " disk {" - $drbd["resources"][res_name]["disk"].each_key do |key| - file.puts " "+key+"\t"+$drbd["resources"][res_name]["disk"][key]+";" + $drbd["resources"][res_name]["disk_s"].each_key do |key| + file.puts " "+key+"\t"+$drbd["resources"][res_name]["disk_s"][key]+";" end file.puts " }" end @@ -1101,6 +1719,14 @@ file.puts " }" end + if $drbd["resources"][res_name].has_key?("handlers") then + file.puts " handlers {" + $drbd["resources"][res_name]["handlers"].each_key do |key| + file.puts " "+key+"\t"+$drbd["resources"][res_name]["handlers"][key]+";" + end + file.puts " }" + end + if $drbd["resources"][res_name].has_key?("on") then $drbd["resources"][res_name]["on"].each_key do |node_name| file.puts " on "+node_name+" {" @@ -1128,10 +1754,12 @@ # `Write (.drbd) means to write the file, other wise, the file is not written anyway +errlog($drbd.to_s) + $stdin.each do |line| errlog(line) line.chomp - cmd = line.gsub(/^`?([a-zA-Z]+)\s.*$/, '\1') + cmd = line.gsub(/^`?([a-zA-Z]+)\s+$/, '\1') path = line.gsub(/^`?([a-zA-Z]+)\s+$([^,]*)(,.*)?$$/, '\2').split('.')-[""]-["\n"] args = line.gsub(/^`?([a-zA-Z]+)\s+$([^,]*)(,.*)?$$/, '\3') if args.length != 0 then Modified: trunk/drbd/autodocs-ycp.ami URL: http://svn.opensuse.org/viewcvs/yast/trunk/drbd/autodocs-ycp.ami?rev=66102&… ============================================================================== --- trunk/drbd/autodocs-ycp.ami (original) +++ trunk/drbd/autodocs-ycp.ami Wed Sep 28 09:26:53 2011 @@ -1,18 +1,32 @@ # -*- makefile -*- Automake include file -# $Id: autodocs-ycp.ami 23438 2005-05-17 16:31:21Z mvidner $ +# $Id: autodocs-ycp.ami 57644 2009-06-19 08:38:11Z mvidner $ # Builds source documentation for YCP sources # Uses ycpdoc # PARAMETERS: # AUTODOCS_YCP: Files that the ycp autodocs is built from # Optional - the default is $(srcdir)/../../src/*.ycp +# AUTODOCS_PM: Files that the perl autodocs is built from +# Optional - the default is $(srcdir)/../../src/*.pm +# AUTODOCS_SUBDIR: To install the result to $(docdir)/SUBDIR/autodocs +# Optional - the default is no subdir, $(docdir)/autodocs +# AUTODOCS_STRIP: Strip it from filenames. The remaining / are replaced by __ +# Optional - the default is $(srcdir)/../../src -htmldir = $(docdir)/autodocs +htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs -html_DATA = index.html $(wildcard *.html) -CLEANFILES = $(html_DATA) +html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) +CLEANFILES = $(html_DATA) pod2htm*.tmp -AUTODOCS_YCP ?= $(srcdir)/../../src/*.ycp -index.html: $(AUTODOCS_YCP) - ${YCPDOC} -d. $^ +AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp) +AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm) +AUTODOCS_STRIP ?= $(srcdir)/../../src +index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM) +#including *.pm, for the index + ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP) + for i in $(AUTODOCS_PM); do \ + b=$${i##$(AUTODOCS_STRIP)}; b=$${b#/}; b=$${b//\//__}; b=$${b%.pm}; \ + pod2html --title=$$b --infile=$$i --outfile=$$b.html; \ + echo "<a href='$$b.html'>$${b/__/::}</a>" > $$b.mod.html; \ + done Modified: trunk/drbd/configure.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/drbd/configure.in?rev=66102&r1=6… ============================================================================== --- trunk/drbd/configure.in (original) +++ trunk/drbd/configure.in Wed Sep 28 09:26:53 2011 @@ -1,9 +1,9 @@ dnl configure.in for yast2-drbd dnl -dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.21.2 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-drbd, 2.13.0, http://bugs.opensuse.org/, yast2-drbd) +AC_INIT(yast2-drbd, 2.15.0, http://bugs.opensuse.org/, yast2-drbd) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -14,10 +14,11 @@ AC_PREFIX_DEFAULT(/usr) -AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs +dnl long filenames; we use GNU Make extensions and that's ok +AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.13.0" +VERSION="2.15.0" RPMNAME="yast2-drbd" MAINTAINER="xwhu <xwhu(a)novell.com>" @@ -107,9 +108,11 @@ dnl no need for AC_ARG_VAR AC_PATH_PROG(XGETTEXT, xgettext) if test -z "$XGETTEXT" ; then - AC_MSG_ERROR(xgettext is missing; please install gettext-devel.) + AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +AC_SUBST(Y2DEVTOOLS_PREFIX) devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` @@ -142,6 +145,9 @@ if test "$YCPC" = "false"; then AC_MSG_ERROR([ycpc is not installed]) fi +AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [ + AC_MSG_WARN([yast2-testsuite.rpm is not installed]) +]) AC_CONFIG_FILES(Makefile agents/Makefile Modified: trunk/drbd/doc/Makefile.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/drbd/doc/Makefile.in?rev=66102&r… ============================================================================== --- trunk/drbd/doc/Makefile.in (original) +++ trunk/drbd/doc/Makefile.in Wed Sep 28 09:26:53 2011 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.9.6 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 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. @@ -16,15 +17,12 @@ # Makefile.am for drbd/doc -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -47,43 +45,85 @@ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +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__installdirs = "$(DESTDIR)$(docdir)" "$(DESTDIR)$(htmldir)" -docDATA_INSTALL = $(INSTALL_DATA) -htmlDATA_INSTALL = $(INSTALL_DATA) DATA = $(doc_DATA) $(html_DATA) +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ + distdir ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^$[^/]*$/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/$[^/]*$$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CREATE_PKGCONFIG_FALSE = @CREATE_PKGCONFIG_FALSE@ -CREATE_PKGCONFIG_NOARCH_FALSE = @CREATE_PKGCONFIG_NOARCH_FALSE@ -CREATE_PKGCONFIG_NOARCH_TRUE = @CREATE_PKGCONFIG_NOARCH_TRUE@ -CREATE_PKGCONFIG_TRUE = @CREATE_PKGCONFIG_TRUE@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -94,11 +134,13 @@ LTLIBOBJS = @LTLIBOBJS@ MAINTAINER = @MAINTAINER@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ PACKAGE = @PACKAGE@ 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_PATH = @PKG_CONFIG_PATH@ @@ -113,10 +155,14 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YCPC = @YCPC@ YCPDOC = @YCPDOC@ YCPMAKEDEP = @YCPMAKEDEP@ -ac_ct_STRIP = @ac_ct_STRIP@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ agentdir = @agentdir@ am__leading_dot = @am__leading_dot@ am__tar = @am__tar@ @@ -127,10 +173,13 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ clientdir = @clientdir@ datadir = @datadir@ +datarootdir = @datarootdir@ desktopdir = @desktopdir@ docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ execcompdir = @execcompdir@ fillupdir = @fillupdir@ @@ -139,6 +188,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = $(docdir) imagedir = @imagedir@ includedir = @includedir@ infodir = @infodir@ @@ -151,16 +201,19 @@ mkdir_p = @mkdir_p@ moduledir = @moduledir@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pkgconfigdatadir = @pkgconfigdatadir@ pkgconfigdir = @pkgconfigdir@ plugindir = @plugindir@ potdir = @potdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ schemadir = @schemadir@ scrconfdir = @scrconfdir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ @@ -168,13 +221,15 @@ target_os = @target_os@ target_vendor = @target_vendor@ themedir = @themedir@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ yast2dir = @yast2dir@ ybindir = @ybindir@ ydatadir = @ydatadir@ yncludedir = @yncludedir@ ystartupdir = @ystartupdir@ SUBDIRS = autodocs -htmldir = $(docdir) doc_DATA = html_DATA = EXTRA_DIST = $(doc_DATA) $(html_DATA) @@ -185,14 +240,14 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu doc/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -210,41 +265,47 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: +$(am__aclocal_m4_deps): install-docDATA: $(doc_DATA) @$(NORMAL_INSTALL) - test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)" - @list='$(doc_DATA)'; for p in $$list; do \ + test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" + @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \ - $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \ done uninstall-docDATA: @$(NORMAL_UNINSTALL) - @list='$(doc_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(docdir)/$$f'"; \ - rm -f "$(DESTDIR)$(docdir)/$$f"; \ - done + @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(docdir)" && rm -f $$files install-htmlDATA: $(html_DATA) @$(NORMAL_INSTALL) - test -z "$(htmldir)" || $(mkdir_p) "$(DESTDIR)$(htmldir)" - @list='$(html_DATA)'; for p in $$list; do \ + test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)" + @list='$(html_DATA)'; test -n "$(htmldir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(htmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \ - $(htmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(htmldir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(htmldir)" || exit $$?; \ done uninstall-htmlDATA: @$(NORMAL_UNINSTALL) - @list='$(html_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(htmldir)/$$f'"; \ - rm -f "$(DESTDIR)$(htmldir)/$$f"; \ - done + @list='$(html_DATA)'; test -n "$(htmldir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(htmldir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(htmldir)" && rm -f $$files # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -253,7 +314,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -270,16 +331,15 @@ else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: - @failcom='exit 1'; \ +$(RECURSIVE_CLEAN_TARGETS): + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -305,16 +365,16 @@ else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done ctags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -322,14 +382,14 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ include_option=--etags-include; \ @@ -341,81 +401,101 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - 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 -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$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 - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + am__skip_mode_fix=: \ distdir) \ || exit 1; \ fi; \ @@ -426,7 +506,7 @@ installdirs: installdirs-recursive installdirs-am: for dir in "$(DESTDIR)$(docdir)" "$(DESTDIR)$(htmldir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive install-exec: install-exec-recursive @@ -448,6 +528,7 @@ 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" @@ -466,18 +547,38 @@ html: html-recursive +html-am: + info: info-recursive info-am: install-data-am: install-docDATA install-htmlDATA +install-dvi: install-dvi-recursive + +install-dvi-am: + install-exec-am: +install-html: install-html-recursive + +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: +install-pdf: install-pdf-recursive + +install-pdf-am: + +install-ps: install-ps-recursive + +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -496,22 +597,25 @@ ps-am: -uninstall-am: uninstall-docDATA uninstall-htmlDATA uninstall-info-am +uninstall-am: uninstall-docDATA uninstall-htmlDATA -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ + install-am install-strip tags-recursive -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-recursive distclean-tags \ +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic ctags \ + ctags-recursive distclean distclean-generic distclean-tags \ distdir dvi dvi-am html html-am info info-am install \ install-am install-data install-data-am install-docDATA \ - install-exec install-exec-am install-htmlDATA install-info \ - install-info-am install-man install-strip installcheck \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-htmlDATA install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic maintainer-clean-recursive \ - mostlyclean mostlyclean-generic mostlyclean-recursive pdf \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-docDATA uninstall-htmlDATA uninstall-info-am + uninstall-docDATA uninstall-htmlDATA + # 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. Modified: trunk/drbd/doc/autodocs/Makefile.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/drbd/doc/autodocs/Makefile.in?re… ============================================================================== --- trunk/drbd/doc/autodocs/Makefile.in (original) +++ trunk/drbd/doc/autodocs/Makefile.in Wed Sep 28 09:26:53 2011 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.9.6 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 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. @@ -17,23 +18,26 @@ # Makefile.am for drbd/doc/autodocs # -*- makefile -*- Automake include file -# $Id: autodocs-ycp.ami 23438 2005-05-17 16:31:21Z mvidner $ +# $Id: autodocs-ycp.ami 57644 2009-06-19 08:38:11Z mvidner $ # Builds source documentation for YCP sources # Uses ycpdoc # PARAMETERS: # AUTODOCS_YCP: Files that the ycp autodocs is built from # Optional - the default is $(srcdir)/../../src/*.ycp +# AUTODOCS_PM: Files that the perl autodocs is built from +# Optional - the default is $(srcdir)/../../src/*.pm +# AUTODOCS_SUBDIR: To install the result to $(docdir)/SUBDIR/autodocs +# Optional - the default is no subdir, $(docdir)/autodocs +# AUTODOCS_STRIP: Strip it from filenames. The remaining / are replaced by __ +# Optional - the default is $(srcdir)/../../src -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -57,6 +61,7 @@ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -64,9 +69,23 @@ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +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__installdirs = "$(DESTDIR)$(htmldir)" -htmlDATA_INSTALL = $(INSTALL_DATA) DATA = $(html_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -75,15 +94,12 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CREATE_PKGCONFIG_FALSE = @CREATE_PKGCONFIG_FALSE@ -CREATE_PKGCONFIG_NOARCH_FALSE = @CREATE_PKGCONFIG_NOARCH_FALSE@ -CREATE_PKGCONFIG_NOARCH_TRUE = @CREATE_PKGCONFIG_NOARCH_TRUE@ -CREATE_PKGCONFIG_TRUE = @CREATE_PKGCONFIG_TRUE@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -94,11 +110,13 @@ LTLIBOBJS = @LTLIBOBJS@ MAINTAINER = @MAINTAINER@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ PACKAGE = @PACKAGE@ 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_PATH = @PKG_CONFIG_PATH@ @@ -113,10 +131,14 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YCPC = @YCPC@ YCPDOC = @YCPDOC@ YCPMAKEDEP = @YCPMAKEDEP@ -ac_ct_STRIP = @ac_ct_STRIP@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ agentdir = @agentdir@ am__leading_dot = @am__leading_dot@ am__tar = @am__tar@ @@ -127,10 +149,13 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ clientdir = @clientdir@ datadir = @datadir@ +datarootdir = @datarootdir@ desktopdir = @desktopdir@ docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ execcompdir = @execcompdir@ fillupdir = @fillupdir@ @@ -139,6 +164,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs imagedir = @imagedir@ includedir = @includedir@ infodir = @infodir@ @@ -151,16 +177,19 @@ mkdir_p = @mkdir_p@ moduledir = @moduledir@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pkgconfigdatadir = @pkgconfigdatadir@ pkgconfigdir = @pkgconfigdir@ plugindir = @plugindir@ potdir = @potdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ schemadir = @schemadir@ scrconfdir = @scrconfdir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ @@ -168,14 +197,16 @@ target_os = @target_os@ target_vendor = @target_vendor@ themedir = @themedir@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ yast2dir = @yast2dir@ ybindir = @ybindir@ ydatadir = @ydatadir@ yncludedir = @yncludedir@ ystartupdir = @ystartupdir@ -htmldir = $(docdir)/autodocs -html_DATA = index.html $(wildcard *.html) -CLEANFILES = $(html_DATA) +html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) +CLEANFILES = $(html_DATA) pod2htm*.tmp all: all-am .SUFFIXES: @@ -183,14 +214,14 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/autodocs/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/autodocs/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/autodocs/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu doc/autodocs/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -208,24 +239,27 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: +$(am__aclocal_m4_deps): install-htmlDATA: $(html_DATA) @$(NORMAL_INSTALL) - test -z "$(htmldir)" || $(mkdir_p) "$(DESTDIR)$(htmldir)" - @list='$(html_DATA)'; for p in $$list; do \ + test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)" + @list='$(html_DATA)'; test -n "$(htmldir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(htmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \ - $(htmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(htmldir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(htmldir)" || exit $$?; \ done uninstall-htmlDATA: @$(NORMAL_UNINSTALL) - @list='$(html_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(htmldir)/$$f'"; \ - rm -f "$(DESTDIR)$(htmldir)/$$f"; \ - done + @list='$(html_DATA)'; test -n "$(htmldir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(htmldir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(htmldir)" && rm -f $$files tags: TAGS TAGS: @@ -234,30 +268,32 @@ distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/../.. - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - 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 -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$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 @@ -266,7 +302,7 @@ all-am: Makefile $(DATA) installdirs: for dir in "$(DESTDIR)$(htmldir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -289,6 +325,7 @@ 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" @@ -307,18 +344,38 @@ html: html-am +html-am: + info: info-am info-am: install-data-am: install-htmlDATA +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 @@ -337,21 +394,35 @@ ps-am: -uninstall-am: uninstall-htmlDATA uninstall-info-am +uninstall-am: uninstall-htmlDATA + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-htmlDATA install-info install-info-am \ - install-man install-strip installcheck installcheck-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-htmlDATA install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \ - uninstall-am uninstall-htmlDATA uninstall-info-am + uninstall-am uninstall-htmlDATA + +AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp) +AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm) +AUTODOCS_STRIP ?= $(srcdir)/../../src + +index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM) +#including *.pm, for the index + ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP) + for i in $(AUTODOCS_PM); do \ + b=$${i##$(AUTODOCS_STRIP)}; b=$${b#/}; b=$${b//\//__}; b=$${b%.pm}; \ + pod2html --title=$$b --infile=$$i --outfile=$$b.html; \ + echo "<a href='$$b.html'>$${b/__/::}</a>" > $$b.mod.html; \ + done -AUTODOCS_YCP ?= $(srcdir)/../../src/*.ycp -index.html: $(AUTODOCS_YCP) - ${YCPDOC} -d. $^ # 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: Added: trunk/drbd/package/yast2-drbd.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/drbd/package/yast2-drbd.changes?… ============================================================================== --- trunk/drbd/package/yast2-drbd.changes (added) +++ trunk/drbd/package/yast2-drbd.changes Wed Sep 28 09:26:53 2011 @@ -0,0 +1,58 @@ +Mon Jan 12 10:37:53 CST 2009 - xwhu(a)suse.de + +- bnc#464116: texts not marked for translation + +Thu Dec 18 22:09:29 CST 2008 - xwhu(a)suse.de + +- bnc#459742: drbd module crashes in ncurses mode +- bnc#459747: drbd module doesn't update to the latest drbd.conf + +------------------------------------------------------------------- +Wed Nov 19 17:49:14 CST 2008 - cmeng(a)novell.com + +- bnc#442758: use another API to set the button lable + +------------------------------------------------------------------- +Thu Oct 2 13:02:01 CST 2008 - xwhu(a)suse.de + +- Replace ReplaceNextButton with SetNextButton (bnc#429021) + +------------------------------------------------------------------- +Wed Jul 16 08:11:51 CEST 2008 - xwhu(a)suse.de + +- pae was not recognized as a kernel arch (bnc#380074) + +------------------------------------------------------------------- +Mon Apr 7 08:42:49 CEST 2008 - xwhu(a)suse.de + +- bugzilla 291490: typo in resource_conf.ycp + +------------------------------------------------------------------- +Mon Jul 30 13:36:28 CEST 2007 - cmeng(a)novell.com + +- fix bug-295546: resource config get deleted +- refix bug-291766: check also iseries64 and ppc64 + +------------------------------------------------------------------- +Mon Jul 23 11:32:52 CEST 2007 - cmeng(a)novell.com + +- fix bug-291766: yast-drbd doesn't install drbd-kmp-<arch> pack +- fix bug-291778: yast-drbd recreate drbd.conf while it doesn't exist +- fix bug-291785: set the default val of protocol even 'advance page' not be accesed +- fix bug-291771: refine some error messages and logs + +------------------------------------------------------------------- +Mon Jun 18 07:23:46 CEST 2007 - xwhu(a)novell.com + +- Change the instruction message about propagating configuration +- Reuse yast-iscsi-client.png + +------------------------------------------------------------------- +Thu Apr 26 09:44:39 CEST 2007 - xwhu(a)novell.com + +- update to version 2.13.1 + +------------------------------------------------------------------- +Tue Apr 24 10:20:52 CEST 2007 - xwhu(a)novell.com + +- initial version 2.13.0 Modified: trunk/drbd/src/drbd.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/drbd/src/drbd.desktop?rev=66102&… ============================================================================== --- trunk/drbd/src/drbd.desktop (original) +++ trunk/drbd/src/drbd.desktop Wed Sep 28 09:26:53 2011 @@ -18,5 +18,5 @@ Icon=yast-iscsi-client Exec=xdg-su -c "/sbin/yast2 drbd" -Name=Drbd -GenericName=drbd +Name=DRBD +GenericName=DRBD Configuration \ No newline at end of file Modified: trunk/drbd/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/drbd/src/wizards.ycp?rev=66102&r… ============================================================================== --- trunk/drbd/src/wizards.ycp (original) +++ trunk/drbd/src/wizards.ycp Wed Sep 28 09:26:53 2011 @@ -65,6 +65,7 @@ }); Wizard::CreateTree(tree, "DRBD"); + Wizard::SetDesktopTitleAndIcon ("drbd"); // Buttons redefinition Wizard::SetNextButton(`next, Label::FinishButton()); Modified: trunk/drbd/testsuite/Makefile.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/drbd/testsuite/Makefile.in?rev=6… ============================================================================== --- trunk/drbd/testsuite/Makefile.in (original) +++ trunk/drbd/testsuite/Makefile.in Wed Sep 28 09:26:53 2011 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.9.6 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 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. @@ -19,15 +20,12 @@ # # Do not edit this file (Makefile.am) as it will be overwritten! # -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -50,6 +48,7 @@ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = DEJATOOL = $(PACKAGE) @@ -63,15 +62,12 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CREATE_PKGCONFIG_FALSE = @CREATE_PKGCONFIG_FALSE@ -CREATE_PKGCONFIG_NOARCH_FALSE = @CREATE_PKGCONFIG_NOARCH_FALSE@ -CREATE_PKGCONFIG_NOARCH_TRUE = @CREATE_PKGCONFIG_NOARCH_TRUE@ -CREATE_PKGCONFIG_TRUE = @CREATE_PKGCONFIG_TRUE@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -82,11 +78,13 @@ LTLIBOBJS = @LTLIBOBJS@ MAINTAINER = @MAINTAINER@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ PACKAGE = @PACKAGE@ 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_PATH = @PKG_CONFIG_PATH@ @@ -101,10 +99,14 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YCPC = @YCPC@ YCPDOC = @YCPDOC@ YCPMAKEDEP = @YCPMAKEDEP@ -ac_ct_STRIP = @ac_ct_STRIP@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ agentdir = @agentdir@ am__leading_dot = @am__leading_dot@ am__tar = @am__tar@ @@ -115,10 +117,13 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ clientdir = @clientdir@ datadir = @datadir@ +datarootdir = @datarootdir@ desktopdir = @desktopdir@ docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ execcompdir = @execcompdir@ fillupdir = @fillupdir@ @@ -127,6 +132,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ imagedir = @imagedir@ includedir = @includedir@ infodir = @infodir@ @@ -139,16 +145,19 @@ mkdir_p = @mkdir_p@ moduledir = @moduledir@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pkgconfigdatadir = @pkgconfigdatadir@ pkgconfigdir = @pkgconfigdir@ plugindir = @plugindir@ potdir = @potdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ schemadir = @schemadir@ scrconfdir = @scrconfdir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ @@ -156,6 +165,9 @@ target_os = @target_os@ target_vendor = @target_vendor@ themedir = @themedir@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ yast2dir = @yast2dir@ ybindir = @ybindir@ ydatadir = @ydatadir@ @@ -171,14 +183,14 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu testsuite/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu testsuite/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu testsuite/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu testsuite/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -196,7 +208,7 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: +$(am__aclocal_m4_deps): tags: TAGS TAGS: @@ -209,11 +221,13 @@ EXPECT=$(EXPECT); export EXPECT; \ runtest=$(RUNTEST); \ if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \ - l='$(DEJATOOL)'; for tool in $$l; do \ - $$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) $(RUNTESTFLAGS); \ + exit_status=0; l='$(DEJATOOL)'; for tool in $$l; do \ + if $$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) $(RUNTESTFLAGS); \ + then :; else exit_status=1; fi; \ done; \ else echo "WARNING: could not find \`runtest'" 1>&2; :;\ - fi + fi; \ + exit $$exit_status site.exp: Makefile @echo 'Making a new site.exp file...' @echo '## these variables are automatically generated by make ##' >site.tmp @@ -241,30 +255,32 @@ done distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/tests - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - 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 -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$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 @@ -293,6 +309,7 @@ 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" @@ -311,18 +328,38 @@ html: html-am +html-am: + info: info-am info-am: install-data-am: +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 @@ -341,17 +378,20 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: check-am install-am install-strip .PHONY: all all-am all-local check check-DEJAGNU check-am check-local \ clean clean-generic clean-local distclean distclean-DEJAGNU \ distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am all-local: $(testsuite_prepare) @@ -364,6 +404,7 @@ make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) check # EOF + # 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: -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66101 - /trunk/sound/sound/src/Joystick.ycp
by lslezak＠svn2.opensuse.org 27 Sep '11

27 Sep '11

Author: lslezak Date: Tue Sep 27 16:44:36 2011 New Revision: 66101 URL: http://svn.opensuse.org/viewcvs/yast?rev=66101&view=rev Log: - use Service::Start()/Stop() instead of hardcoded scripts (systemd support) Modified: trunk/sound/sound/src/Joystick.ycp Modified: trunk/sound/sound/src/Joystick.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/Joystick.ycp?rev… ============================================================================== --- trunk/sound/sound/src/Joystick.ycp (original) +++ trunk/sound/sound/src/Joystick.ycp Tue Sep 27 16:44:36 2011 @@ -251,8 +251,7 @@ * Stop joystick service */ global define boolean Stop() ``{ - return - (SCR::Execute(.target.bash, "/etc/init.d/joystick stop", $[]) == 0); + return Service::Stop("joystick"); } /** @@ -268,7 +267,8 @@ global define boolean StartAndEnable() ``{ if (start == "enable") - SCR::Execute(.target.bash, "/etc/init.d/joystick start", $[]); + Service::Start("joystick"); + Service::Adjust("joystick", start); return true; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0