Mailinglist Archive: yast-commit (747 mails)

< Previous Next >
[yast-commit] r39493 - in /trunk/squid: agents/ doc/autodocs/ src/ testsuite/
  • From: dfiser@xxxxxxxxxxxxxxxx
  • Date: Wed, 18 Jul 2007 10:11:43 -0000
  • Message-id: <20070718101143.5C7A8C84FD@xxxxxxxxxxxxxxxx>
Author: dfiser
Date: Wed Jul 18 12:11:42 2007
New Revision: 39493

URL: http://svn.opensuse.org/viewcvs/yast?rev=39493&view=rev
Log:
GUI concept of main sequence

Added:
    trunk/squid/agents/squid.scr
Modified:
    trunk/squid/agents/Makefile
    trunk/squid/agents/Makefile.am
    trunk/squid/agents/Makefile.in
    trunk/squid/doc/autodocs/Makefile
    trunk/squid/doc/autodocs/Makefile.in
    trunk/squid/src/complex.ycp
    trunk/squid/src/dialogs.ycp
    trunk/squid/src/squid.ycp
    trunk/squid/src/wizards.ycp
    trunk/squid/testsuite/Makefile
    trunk/squid/testsuite/Makefile.in

Modified: trunk/squid/agents/Makefile
URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/agents/Makefile?rev=39493&r1=39492&r2=39493&view=diff
==============================================================================
--- trunk/squid/agents/Makefile (original)
+++ trunk/squid/agents/Makefile Wed Jul 18 12:11:42 2007
@@ -1,5 +1,5 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
-# ./devtools/skeletons/config/agents/Makefile.  Generated from Makefile.in by configure.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# agents/Makefile.  Generated from Makefile.in by configure.
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 # 2003, 2004, 2005  Free Software Foundation, Inc.
@@ -18,12 +18,12 @@
 
 
 srcdir = .
-top_srcdir = ../../../..
+top_srcdir = ..
 
-pkgdatadir = $(datadir)/yast2-devtools
-pkglibdir = $(libdir)/yast2-devtools
-pkgincludedir = $(includedir)/yast2-devtools
-top_builddir = ../../../..
+pkgdatadir = $(datadir)/yast2-squid
+pkglibdir = $(libdir)/yast2-squid
+pkgincludedir = $(includedir)/yast2-squid
+top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = /usr/bin/install -c -p
 install_sh_DATA = $(install_sh) -c -m 644
@@ -37,14 +37,13 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = ia64-suse-linux
-host_triplet = ia64-suse-linux
-target_triplet = ia64-suse-linux
-subdir = ./devtools/skeletons/config/agents
+build_triplet = x86_64-suse-linux-gnu
+host_triplet = x86_64-suse-linux-gnu
+target_triplet = x86_64-suse-linux-gnu
+subdir = agents
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-       $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -63,119 +62,84 @@
 scrconfDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(scrconf_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /local/yast2/trunk/devtools/missing --run aclocal-1.9
-AMDEP_FALSE = #
-AMDEP_TRUE = 
-AMTAR = ${SHELL} /local/yast2/trunk/devtools/missing --run tar
-AR = ar
-AUTOCONF = ${SHELL} /local/yast2/trunk/devtools/missing --run autoconf
-AUTOHEADER = ${SHELL} /local/yast2/trunk/devtools/missing --run autoheader
-AUTOMAKE = ${SHELL} /local/yast2/trunk/devtools/missing --run automake-1.9
+ACLOCAL = ${SHELL} /home/dfiser/yast/squid/missing --run aclocal-1.9
+AMTAR = ${SHELL} /home/dfiser/yast/squid/missing --run tar
+AUTOCONF = ${SHELL} /home/dfiser/yast/squid/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/dfiser/yast/squid/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/dfiser/yast/squid/missing --run automake-1.9
 AWK = gawk
-CAT_ENTRY_END = -->
-CAT_ENTRY_START = <!--
-CC = gcc
-CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2
-CPP = gcc -E
-CPPFLAGS = 
-CREATE_PKGCONFIG_FALSE = #
-CREATE_PKGCONFIG_TRUE = 
-CXX = g++
-CXXCPP = g++ -E
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O2
+CREATE_PKGCONFIG_FALSE = 
+CREATE_PKGCONFIG_NOARCH_FALSE = 
+CREATE_PKGCONFIG_NOARCH_TRUE = #
+CREATE_PKGCONFIG_TRUE = #
 CYGPATH_W = echo
-DEFS = -DPACKAGE_NAME=\"yast2-devtools\" -DPACKAGE_TARNAME=\"yast2-devtools\" -DPACKAGE_VERSION=\"2.12.0\" -DPACKAGE_STRING=\"yast2-devtools\ 2.12.0\" -DPACKAGE_BUGREPORT=\"http://www.suse.de/feedback\" -DPACKAGE=\"yast2-devtools\" -DVERSION=\"2.12.0\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 ;
-DEPDIR = .deps
-DOCBOOK_ROOT = 
-ECHO = echo
+DEFS = -DPACKAGE_NAME=\"yast2-squid\" -DPACKAGE_TARNAME=\"yast2-squid\" -DPACKAGE_VERSION=\"2.13.0\" -DPACKAGE_STRING=\"yast2-squid\ 2.13.0\" -DPACKAGE_BUGREPORT=\"http://bugs.opensuse.org/\" -DPACKAGE=\"yast2-squid\" -DVERSION=\"2.13.0\";
 ECHO_C = 
 ECHO_N = -n
 ECHO_T = 
-EGREP = grep -E
-EXEEXT = 
-F77 = g77
-FFLAGS = -g -O2
 INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
-LDFLAGS = 
 LIBOBJS = 
 LIBS = 
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
 LN_S = ln -s
 LTLIBOBJS = 
-MAINTAINER = Martin Vidner <mvidner@xxxxxxx>
-MAKEINFO = ${SHELL} /local/yast2/trunk/devtools/missing --run makeinfo
-OBJEXT = o
-PACKAGE = yast2-devtools
-PACKAGE_BUGREPORT = http://www.suse.de/feedback
-PACKAGE_NAME = yast2-devtools
-PACKAGE_STRING = yast2-devtools 2.12.0
-PACKAGE_TARNAME = yast2-devtools
-PACKAGE_VERSION = 2.12.0
+MAINTAINER = Daniel Fiser <dfiser@xxxxxxx>
+MAKEINFO = ${SHELL} /home/dfiser/yast/squid/missing --run makeinfo
+PACKAGE = yast2-squid
+PACKAGE_BUGREPORT = http://bugs.opensuse.org/
+PACKAGE_NAME = yast2-squid
+PACKAGE_STRING = yast2-squid 2.13.0
+PACKAGE_TARNAME = yast2-squid
+PACKAGE_VERSION = 2.13.0
 PATH_SEPARATOR = :
-PERL = perl
-PKG_CONFIG_PATH = /usr/local/lib/pkgconfig:/usr/lib/pkgconfig:/opt/gnome/lib/pkgconfig
-RANLIB = ranlib
-RPMNAME = yast2-devtools
+PKG_CONFIG_PATH = /usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig:/opt/kde3/lib64/pkgconfig:/opt/gnome/lib64/pkgconfig:/opt/gnome/lib64/pkgconfig:/opt/gnome/share/pkgconfig
+RPMNAME = yast2-squid
 SET_MAKE = 
 SHELL = /bin/sh
-STRIP = strip
+STRIP = 
 STYLESHEET_CSS = /usr/share/YaST2/data/docbook/css/yast2docs.css
 STYLESHEET_HTML = /usr/share/YaST2/data/docbook/stylesheets/customize-html.xsl
 STYLESHEET_PDF = /usr/share/YaST2/data/docbook/stylesheets/customize-fo.xsl
 STYLESHEET_YCPDOC = /usr/share/YaST2/data/docbook/stylesheets/ycpdoc.xsl
 STYLESHEET_YDOC = /usr/share/YaST2/data/docbook/stylesheets/ydoc.xsl
-VERSION = 2.12.0
+VERSION = 2.13.0
 XGETTEXT = /usr/bin/xgettext
-XML_CATALOG = /etc/xml/catalog
-XSLTPROC = /usr/bin/xsltproc
-XSLTPROC_FLAGS = --nonet
-YAST2DEVTOOLS = ${prefix}/share/YaST2/data/devtools
-YCPDOC = ./ycpdoc/src/ycpdoc
-ac_ct_AR = ar
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_F77 = g77
-ac_ct_RANLIB = ranlib
-ac_ct_STRIP = strip
+Y2DEVTOOLS_PREFIX = /usr
+YCPC = /usr/bin/ycpc
+YCPDOC = /usr/lib/YaST2/bin/ycpdoc
+YCPMAKEDEP = /usr/lib/YaST2/bin/ycpmakedep
 agentdir = ${prefix}/lib/YaST2/servers_non_y2
-am__fastdepCC_FALSE = #
-am__fastdepCC_TRUE = 
-am__fastdepCXX_FALSE = #
-am__fastdepCXX_TRUE = 
-am__include = include
 am__leading_dot = .
-am__quote = 
 am__tar = tar --format=ustar -chf - "$$tardir"
 am__untar = tar -xf -
 bindir = ${exec_prefix}/bin
-build = ia64-suse-linux
+build = x86_64-suse-linux-gnu
 build_alias = 
-build_cpu = ia64
-build_os = linux
+build_cpu = x86_64
+build_os = linux-gnu
 build_vendor = suse
 clientdir = ${prefix}/share/YaST2/clients
-datadir = ${prefix}/share
+datadir = ${datarootdir}
+datarootdir = ${prefix}/share
 desktopdir = ${prefix}/share/applications/YaST2
-docdir = ${prefix}/share/doc/packages/yast2-devtools
+docdir = ${prefix}/share/doc/packages/yast2-squid
+dvidir = ${docdir}
 exec_prefix = ${prefix}
 execcompdir = ${prefix}/lib/YaST2
-have_xsltproc_FALSE = #
-have_xsltproc_TRUE = 
-host = ia64-suse-linux
+fillupdir = /var/adm/fillup-templates
+host = x86_64-suse-linux-gnu
 host_alias = 
-host_cpu = ia64
-host_os = linux
+host_cpu = x86_64
+host_os = linux-gnu
 host_vendor = suse
+htmldir = ${docdir}
 imagedir = ${prefix}/share/YaST2/images
 includedir = ${prefix}/include/YaST2
-infodir = ${prefix}/info
-install_sh = /local/yast2/trunk/devtools/install-sh
-libdir = /usr/lib
+infodir = ${datarootdir}/info
+install_sh = /home/dfiser/yast/squid/install-sh
+libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${prefix}/share/YaST2/locale
 localstatedir = ${prefix}/var
@@ -183,20 +147,23 @@
 mkdir_p = mkdir -p --
 moduledir = ${prefix}/share/YaST2/modules
 oldincludedir = /usr/include
+pdfdir = ${docdir}
+pkgconfigdatadir = ${datadir}/pkgconfig
 pkgconfigdir = ${libdir}/pkgconfig
 plugindir = ${libdir}/YaST2/plugin
 potdir = ${docdir}/pot
 prefix = /usr
 program_transform_name = s,x,x,
+psdir = ${docdir}
 sbindir = ${exec_prefix}/sbin
 schemadir = ${prefix}/share/YaST2/schema
 scrconfdir = ${prefix}/share/YaST2/scrconf
 sharedstatedir = ${prefix}/com
 sysconfdir = ${prefix}/etc
-target = ia64-suse-linux
+target = x86_64-suse-linux-gnu
 target_alias = 
-target_cpu = ia64
-target_os = linux
+target_cpu = x86_64
+target_os = linux-gnu
 target_vendor = suse
 themedir = ${prefix}/share/YaST2/theme
 yast2dir = ${prefix}/share/YaST2
@@ -205,7 +172,7 @@
 yncludedir = ${prefix}/share/YaST2/include
 ystartupdir = ${prefix}/lib/YaST2
 agent_SCRIPTS = 
-scrconf_DATA = 
+scrconf_DATA = squid.scr
 EXTRA_DIST = $(agent_SCRIPTS) $(scrconf_DATA)
 all: all-am
 
@@ -219,9 +186,9 @@
              exit 1;; \
          esac; \
        done; \
-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  ./devtools/skeletons/config/agents/Makefile'; \
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  agents/Makefile'; \
        cd $(top_srcdir) && \
-         $(AUTOMAKE) --gnu  ./devtools/skeletons/config/agents/Makefile
+         $(AUTOMAKE) --gnu  agents/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
        @case '$?' in \
@@ -258,15 +225,6 @@
          echo " rm -f '$(DESTDIR)$(agentdir)/$$f'"; \
          rm -f "$(DESTDIR)$(agentdir)/$$f"; \
        done
-
-mostlyclean-libtool:
-       -rm -f *.lo
-
-clean-libtool:
-       -rm -rf .libs _libs
-
-distclean-libtool:
-       -rm -f libtool
 uninstall-info-am:
 install-scrconfDATA: $(scrconf_DATA)
        @$(NORMAL_INSTALL)
@@ -352,11 +310,11 @@
        @echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-generic clean-libtool mostlyclean-am
+clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-am
        -rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -384,7 +342,7 @@
 
 mostlyclean: mostlyclean-am
 
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+mostlyclean-am: mostlyclean-generic
 
 pdf: pdf-am
 
@@ -397,15 +355,14 @@
 uninstall-am: uninstall-agentSCRIPTS uninstall-info-am \
        uninstall-scrconfDATA
 
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-       distclean distclean-generic distclean-libtool 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 installcheck installcheck-am \
-       installdirs maintainer-clean maintainer-clean-generic \
-       mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-       ps ps-am uninstall uninstall-agentSCRIPTS uninstall-am \
+.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 \
+       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
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

Modified: trunk/squid/agents/Makefile.am
URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/agents/Makefile.am?rev=39493&r1=39492&r2=39493&view=diff
==============================================================================
--- trunk/squid/agents/Makefile.am (original)
+++ trunk/squid/agents/Makefile.am Wed Jul 18 12:11:42 2007
@@ -2,6 +2,6 @@
 
 agent_SCRIPTS =
 
-scrconf_DATA =
+scrconf_DATA = squid.scr
 
 EXTRA_DIST = $(agent_SCRIPTS) $(scrconf_DATA)

Modified: trunk/squid/agents/Makefile.in
URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/agents/Makefile.in?rev=39493&r1=39492&r2=39493&view=diff
==============================================================================
--- trunk/squid/agents/Makefile.in (original)
+++ trunk/squid/agents/Makefile.in Wed Jul 18 12:11:42 2007
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23,7 +23,7 @@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../../..
+top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
@@ -40,11 +40,10 @@
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-subdir = ./devtools/skeletons/config/agents
+subdir = agents
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-       $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -64,52 +63,30 @@
 DATA = $(scrconf_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
-AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-CAT_ENTRY_END = @CAT_ENTRY_END@
-CAT_ENTRY_START = @CAT_ENTRY_START@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
 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@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOCBOOK_ROOT = @DOCBOOK_ROOT@
-ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINTAINER = @MAINTAINER@
 MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -117,9 +94,7 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-RANLIB = @RANLIB@
 RPMNAME = @RPMNAME@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -131,25 +106,12 @@
 STYLESHEET_YDOC = @STYLESHEET_YDOC@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
-XML_CATALOG = @XML_CATALOG@
-XSLTPROC = @XSLTPROC@
-XSLTPROC_FLAGS = @XSLTPROC_FLAGS@
-YAST2DEVTOOLS = @YAST2DEVTOOLS@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
+YCPC = @YCPC@
 YCPDOC = @YCPDOC@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
+YCPMAKEDEP = @YCPMAKEDEP@
 agentdir = @agentdir@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
 am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -160,17 +122,19 @@
 build_vendor = @build_vendor@
 clientdir = @clientdir@
 datadir = @datadir@
+datarootdir = @datarootdir@
 desktopdir = @desktopdir@
 docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 execcompdir = @execcompdir@
-have_xsltproc_FALSE = @have_xsltproc_FALSE@
-have_xsltproc_TRUE = @have_xsltproc_TRUE@
+fillupdir = @fillupdir@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 imagedir = @imagedir@
 includedir = @includedir@
 infodir = @infodir@
@@ -183,11 +147,14 @@
 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@
@@ -205,7 +172,7 @@
 yncludedir = @yncludedir@
 ystartupdir = @ystartupdir@
 agent_SCRIPTS = 
-scrconf_DATA = 
+scrconf_DATA = squid.scr
 EXTRA_DIST = $(agent_SCRIPTS) $(scrconf_DATA)
 all: all-am
 
@@ -219,9 +186,9 @@
              exit 1;; \
          esac; \
        done; \
-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  ./devtools/skeletons/config/agents/Makefile'; \
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  agents/Makefile'; \
        cd $(top_srcdir) && \
-         $(AUTOMAKE) --gnu  ./devtools/skeletons/config/agents/Makefile
+         $(AUTOMAKE) --gnu  agents/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
        @case '$?' in \
@@ -258,15 +225,6 @@
          echo " rm -f '$(DESTDIR)$(agentdir)/$$f'"; \
          rm -f "$(DESTDIR)$(agentdir)/$$f"; \
        done
-
-mostlyclean-libtool:
-       -rm -f *.lo
-
-clean-libtool:
-       -rm -rf .libs _libs
-
-distclean-libtool:
-       -rm -f libtool
 uninstall-info-am:
 install-scrconfDATA: $(scrconf_DATA)
        @$(NORMAL_INSTALL)
@@ -352,11 +310,11 @@
        @echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-generic clean-libtool mostlyclean-am
+clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-am
        -rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -384,7 +342,7 @@
 
 mostlyclean: mostlyclean-am
 
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+mostlyclean-am: mostlyclean-generic
 
 pdf: pdf-am
 
@@ -397,15 +355,14 @@
 uninstall-am: uninstall-agentSCRIPTS uninstall-info-am \
        uninstall-scrconfDATA
 
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-       distclean distclean-generic distclean-libtool 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 installcheck installcheck-am \
-       installdirs maintainer-clean maintainer-clean-generic \
-       mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-       ps ps-am uninstall uninstall-agentSCRIPTS uninstall-am \
+.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 \
+       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
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

Added: trunk/squid/agents/squid.scr
URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/agents/squid.scr?rev=39493&view=auto
==============================================================================
--- trunk/squid/agents/squid.scr (added)
+++ trunk/squid/agents/squid.scr Wed Jul 18 12:11:42 2007
@@ -0,0 +1,30 @@
+/**
+ * File: squid.scr
+ * Summary:
+ *   SCR agent for reading/writing /etc/squid/squid.conf using
+ *   ini-agent
+ * Access: read/write
+ * Authors: Daniel Fiser <dfiser@xxxxxxx>
+ * Example:
+ *   `Dir(.squid)
+ *   (["http_port", "hierarchy_stoplist", "acl", "cache", "acl", ... ])
+ *
+ *   `Read(.squid.http_port)
+ *   (["3128 transparent"])
+ *
+ *   `Write(.squid.http_port,"3128 accel")
+ *   true
+ */
+
+.squid
+
+`ag_ini(
+    `IniAgent("/etc/squid/squid.conf",
+              $["params" : [
+                    $["match" : ["^[ \t]*([^ \t]+)[ \t]+(.+)[ \t]*$", "%s %s"]]
+                ],
+                "comments" : ["[ \t]*#.*$", "^[ \t]*$", "[ \t]*$"],
+                "options" : ["flat", "repeat_names", "global_values"]
+              ]
+    )
+)

Modified: trunk/squid/doc/autodocs/Makefile
URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/doc/autodocs/Makefile?rev=39493&r1=39492&r2=39493&view=diff
==============================================================================
--- trunk/squid/doc/autodocs/Makefile (original)
+++ trunk/squid/doc/autodocs/Makefile Wed Jul 18 12:11:42 2007
@@ -1,5 +1,5 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
-# ./devtools/skeletons/config/doc/autodocs/Makefile.  Generated from Makefile.in by configure.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# doc/autodocs/Makefile.  Generated from Makefile.in by configure.
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 # 2003, 2004, 2005  Free Software Foundation, Inc.
@@ -16,13 +16,24 @@
 
 # Makefile.am for squid/doc/autodocs
 
+# -*- makefile -*- Automake include file
+# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z 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
+
 srcdir = .
-top_srcdir = ../../../../..
+top_srcdir = ../..
 
-pkgdatadir = $(datadir)/yast2-devtools
-pkglibdir = $(libdir)/yast2-devtools
-pkgincludedir = $(includedir)/yast2-devtools
-top_builddir = ../../../../..
+pkgdatadir = $(datadir)/yast2-squid
+pkglibdir = $(libdir)/yast2-squid
+pkgincludedir = $(includedir)/yast2-squid
+top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = /usr/bin/install -c -p
 install_sh_DATA = $(install_sh) -c -m 644
@@ -36,14 +47,14 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = ia64-suse-linux
-host_triplet = ia64-suse-linux
-target_triplet = ia64-suse-linux
-subdir = ./devtools/skeletons/config/doc/autodocs
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+build_triplet = x86_64-suse-linux-gnu
+host_triplet = x86_64-suse-linux-gnu
+target_triplet = x86_64-suse-linux-gnu
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+       $(top_srcdir)/autodocs-ycp.ami
+subdir = doc/autodocs
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-       $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -60,119 +71,84 @@
 htmlDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(html_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /local/yast2/trunk/devtools/missing --run aclocal-1.9
-AMDEP_FALSE = #
-AMDEP_TRUE = 
-AMTAR = ${SHELL} /local/yast2/trunk/devtools/missing --run tar
-AR = ar
-AUTOCONF = ${SHELL} /local/yast2/trunk/devtools/missing --run autoconf
-AUTOHEADER = ${SHELL} /local/yast2/trunk/devtools/missing --run autoheader
-AUTOMAKE = ${SHELL} /local/yast2/trunk/devtools/missing --run automake-1.9
+ACLOCAL = ${SHELL} /home/dfiser/yast/squid/missing --run aclocal-1.9
+AMTAR = ${SHELL} /home/dfiser/yast/squid/missing --run tar
+AUTOCONF = ${SHELL} /home/dfiser/yast/squid/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/dfiser/yast/squid/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/dfiser/yast/squid/missing --run automake-1.9
 AWK = gawk
-CAT_ENTRY_END = -->
-CAT_ENTRY_START = <!--
-CC = gcc
-CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2
-CPP = gcc -E
-CPPFLAGS = 
-CREATE_PKGCONFIG_FALSE = #
-CREATE_PKGCONFIG_TRUE = 
-CXX = g++
-CXXCPP = g++ -E
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O2
+CREATE_PKGCONFIG_FALSE = 
+CREATE_PKGCONFIG_NOARCH_FALSE = 
+CREATE_PKGCONFIG_NOARCH_TRUE = #
+CREATE_PKGCONFIG_TRUE = #
 CYGPATH_W = echo
-DEFS = -DPACKAGE_NAME=\"yast2-devtools\" -DPACKAGE_TARNAME=\"yast2-devtools\" -DPACKAGE_VERSION=\"2.12.0\" -DPACKAGE_STRING=\"yast2-devtools\ 2.12.0\" -DPACKAGE_BUGREPORT=\"http://www.suse.de/feedback\" -DPACKAGE=\"yast2-devtools\" -DVERSION=\"2.12.0\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 ;
-DEPDIR = .deps
-DOCBOOK_ROOT = 
-ECHO = echo
+DEFS = -DPACKAGE_NAME=\"yast2-squid\" -DPACKAGE_TARNAME=\"yast2-squid\" -DPACKAGE_VERSION=\"2.13.0\" -DPACKAGE_STRING=\"yast2-squid\ 2.13.0\" -DPACKAGE_BUGREPORT=\"http://bugs.opensuse.org/\" -DPACKAGE=\"yast2-squid\" -DVERSION=\"2.13.0\";
 ECHO_C = 
 ECHO_N = -n
 ECHO_T = 
-EGREP = grep -E
-EXEEXT = 
-F77 = g77
-FFLAGS = -g -O2
 INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
-LDFLAGS = 
 LIBOBJS = 
 LIBS = 
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
 LN_S = ln -s
 LTLIBOBJS = 
-MAINTAINER = Martin Vidner <mvidner@xxxxxxx>
-MAKEINFO = ${SHELL} /local/yast2/trunk/devtools/missing --run makeinfo
-OBJEXT = o
-PACKAGE = yast2-devtools
-PACKAGE_BUGREPORT = http://www.suse.de/feedback
-PACKAGE_NAME = yast2-devtools
-PACKAGE_STRING = yast2-devtools 2.12.0
-PACKAGE_TARNAME = yast2-devtools
-PACKAGE_VERSION = 2.12.0
+MAINTAINER = Daniel Fiser <dfiser@xxxxxxx>
+MAKEINFO = ${SHELL} /home/dfiser/yast/squid/missing --run makeinfo
+PACKAGE = yast2-squid
+PACKAGE_BUGREPORT = http://bugs.opensuse.org/
+PACKAGE_NAME = yast2-squid
+PACKAGE_STRING = yast2-squid 2.13.0
+PACKAGE_TARNAME = yast2-squid
+PACKAGE_VERSION = 2.13.0
 PATH_SEPARATOR = :
-PERL = perl
-PKG_CONFIG_PATH = /usr/local/lib/pkgconfig:/usr/lib/pkgconfig:/opt/gnome/lib/pkgconfig
-RANLIB = ranlib
-RPMNAME = yast2-devtools
+PKG_CONFIG_PATH = /usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig:/opt/kde3/lib64/pkgconfig:/opt/gnome/lib64/pkgconfig:/opt/gnome/lib64/pkgconfig:/opt/gnome/share/pkgconfig
+RPMNAME = yast2-squid
 SET_MAKE = 
 SHELL = /bin/sh
-STRIP = strip
+STRIP = 
 STYLESHEET_CSS = /usr/share/YaST2/data/docbook/css/yast2docs.css
 STYLESHEET_HTML = /usr/share/YaST2/data/docbook/stylesheets/customize-html.xsl
 STYLESHEET_PDF = /usr/share/YaST2/data/docbook/stylesheets/customize-fo.xsl
 STYLESHEET_YCPDOC = /usr/share/YaST2/data/docbook/stylesheets/ycpdoc.xsl
 STYLESHEET_YDOC = /usr/share/YaST2/data/docbook/stylesheets/ydoc.xsl
-VERSION = 2.12.0
+VERSION = 2.13.0
 XGETTEXT = /usr/bin/xgettext
-XML_CATALOG = /etc/xml/catalog
-XSLTPROC = /usr/bin/xsltproc
-XSLTPROC_FLAGS = --nonet
-YAST2DEVTOOLS = ${prefix}/share/YaST2/data/devtools
-YCPDOC = ./ycpdoc/src/ycpdoc
-ac_ct_AR = ar
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_F77 = g77
-ac_ct_RANLIB = ranlib
-ac_ct_STRIP = strip
+Y2DEVTOOLS_PREFIX = /usr
+YCPC = /usr/bin/ycpc
+YCPDOC = /usr/lib/YaST2/bin/ycpdoc
+YCPMAKEDEP = /usr/lib/YaST2/bin/ycpmakedep
 agentdir = ${prefix}/lib/YaST2/servers_non_y2
-am__fastdepCC_FALSE = #
-am__fastdepCC_TRUE = 
-am__fastdepCXX_FALSE = #
-am__fastdepCXX_TRUE = 
-am__include = include
 am__leading_dot = .
-am__quote = 
 am__tar = tar --format=ustar -chf - "$$tardir"
 am__untar = tar -xf -
 bindir = ${exec_prefix}/bin
-build = ia64-suse-linux
+build = x86_64-suse-linux-gnu
 build_alias = 
-build_cpu = ia64
-build_os = linux
+build_cpu = x86_64
+build_os = linux-gnu
 build_vendor = suse
 clientdir = ${prefix}/share/YaST2/clients
-datadir = ${prefix}/share
+datadir = ${datarootdir}
+datarootdir = ${prefix}/share
 desktopdir = ${prefix}/share/applications/YaST2
-docdir = ${prefix}/share/doc/packages/yast2-devtools
+docdir = ${prefix}/share/doc/packages/yast2-squid
+dvidir = ${docdir}
 exec_prefix = ${prefix}
 execcompdir = ${prefix}/lib/YaST2
-have_xsltproc_FALSE = #
-have_xsltproc_TRUE = 
-host = ia64-suse-linux
+fillupdir = /var/adm/fillup-templates
+host = x86_64-suse-linux-gnu
 host_alias = 
-host_cpu = ia64
-host_os = linux
+host_cpu = x86_64
+host_os = linux-gnu
 host_vendor = suse
+htmldir = $(docdir)/autodocs
 imagedir = ${prefix}/share/YaST2/images
 includedir = ${prefix}/include/YaST2
-infodir = ${prefix}/info
-install_sh = /local/yast2/trunk/devtools/install-sh
-libdir = /usr/lib
+infodir = ${datarootdir}/info
+install_sh = /home/dfiser/yast/squid/install-sh
+libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${prefix}/share/YaST2/locale
 localstatedir = ${prefix}/var
@@ -180,20 +156,23 @@
 mkdir_p = mkdir -p --
 moduledir = ${prefix}/share/YaST2/modules
 oldincludedir = /usr/include
+pdfdir = ${docdir}
+pkgconfigdatadir = ${datadir}/pkgconfig
 pkgconfigdir = ${libdir}/pkgconfig
 plugindir = ${libdir}/YaST2/plugin
 potdir = ${docdir}/pot
 prefix = /usr
 program_transform_name = s,x,x,
+psdir = ${docdir}
 sbindir = ${exec_prefix}/sbin
 schemadir = ${prefix}/share/YaST2/schema
 scrconfdir = ${prefix}/share/YaST2/scrconf
 sharedstatedir = ${prefix}/com
 sysconfdir = ${prefix}/etc
-target = ia64-suse-linux
+target = x86_64-suse-linux-gnu
 target_alias = 
-target_cpu = ia64
-target_os = linux
+target_cpu = x86_64
+target_os = linux-gnu
 target_vendor = suse
 themedir = ${prefix}/share/YaST2/theme
 yast2dir = ${prefix}/share/YaST2
@@ -201,13 +180,12 @@
 ydatadir = ${prefix}/share/YaST2/data
 yncludedir = ${prefix}/share/YaST2/include
 ystartupdir = ${prefix}/lib/YaST2
-htmldir = $(docdir)/autodocs
 html_DATA = index.html $(wildcard *.html)
-CLEANFILES = $(html_DATA)
+CLEANFILES = $(html_DATA) pod2htm*.tmp
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/autodocs-ycp.ami $(am__configure_deps)
        @for dep in $?; do \
          case '$(am__configure_deps)' in \
            *$$dep*) \
@@ -216,9 +194,9 @@
              exit 1;; \
          esac; \
        done; \
-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  ./devtools/skeletons/config/doc/autodocs/Makefile'; \
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/autodocs/Makefile'; \
        cd $(top_srcdir) && \
-         $(AUTOMAKE) --gnu  ./devtools/skeletons/config/doc/autodocs/Makefile
+         $(AUTOMAKE) --gnu  doc/autodocs/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
        @case '$?' in \
@@ -236,15 +214,6 @@
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-mostlyclean-libtool:
-       -rm -f *.lo
-
-clean-libtool:
-       -rm -rf .libs _libs
-
-distclean-libtool:
-       -rm -f libtool
 uninstall-info-am:
 install-htmlDATA: $(html_DATA)
        @$(NORMAL_INSTALL)
@@ -271,6 +240,7 @@
 
 
 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 \
@@ -331,11 +301,11 @@
        @echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-generic clean-libtool mostlyclean-am
+clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-am
        -rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -363,7 +333,7 @@
 
 mostlyclean: mostlyclean-am
 
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+mostlyclean-am: mostlyclean-generic
 
 pdf: pdf-am
 
@@ -375,19 +345,27 @@
 
 uninstall-am: uninstall-htmlDATA uninstall-info-am
 
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-       distclean distclean-generic distclean-libtool 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 installdirs \
-       maintainer-clean maintainer-clean-generic mostlyclean \
-       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-       uninstall uninstall-am uninstall-htmlDATA uninstall-info-am
-
-
-index.html: $(srcdir)/../../src/*.ycp $(srcdir)/../../src/*.pm
-       $(ybindir)/ycpdoc -d. $(srcdir)/../../src/*.{ycp,pm}
+.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 \
+       installdirs maintainer-clean maintainer-clean-generic \
+       mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+       uninstall-am uninstall-htmlDATA uninstall-info-am
+
+
+AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp)
+AUTODOCS_PM  ?= $(wildcard $(srcdir)/../../src/*.pm)
+
+index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM)
+#including *.pm, for the index
+       ${YCPDOC} -d. $^
+       for i in $(AUTODOCS_PM); do \
+               b=`basename $$i`; b=$${b%.pm}; \
+               pod2html --title=$$b --infile=$$i --outfile=$$b.html; \
+               echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \
+       done
 # 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/squid/doc/autodocs/Makefile.in
URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/doc/autodocs/Makefile.in?rev=39493&r1=39492&r2=39493&view=diff
==============================================================================
--- trunk/squid/doc/autodocs/Makefile.in (original)
+++ trunk/squid/doc/autodocs/Makefile.in Wed Jul 18 12:11:42 2007
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,13 +16,24 @@
 
 # Makefile.am for squid/doc/autodocs
 
+# -*- makefile -*- Automake include file
+# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z 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
+
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../../../..
+top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
@@ -39,11 +50,11 @@
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-subdir = ./devtools/skeletons/config/doc/autodocs
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+       $(top_srcdir)/autodocs-ycp.ami
+subdir = doc/autodocs
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-       $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -61,52 +72,30 @@
 DATA = $(html_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
-AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-CAT_ENTRY_END = @CAT_ENTRY_END@
-CAT_ENTRY_START = @CAT_ENTRY_START@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
 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@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOCBOOK_ROOT = @DOCBOOK_ROOT@
-ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINTAINER = @MAINTAINER@
 MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -114,9 +103,7 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-RANLIB = @RANLIB@
 RPMNAME = @RPMNAME@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -128,25 +115,12 @@
 STYLESHEET_YDOC = @STYLESHEET_YDOC@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
-XML_CATALOG = @XML_CATALOG@
-XSLTPROC = @XSLTPROC@
-XSLTPROC_FLAGS = @XSLTPROC_FLAGS@
-YAST2DEVTOOLS = @YAST2DEVTOOLS@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
+YCPC = @YCPC@
 YCPDOC = @YCPDOC@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
+YCPMAKEDEP = @YCPMAKEDEP@
 agentdir = @agentdir@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
 am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -157,17 +131,19 @@
 build_vendor = @build_vendor@
 clientdir = @clientdir@
 datadir = @datadir@
+datarootdir = @datarootdir@
 desktopdir = @desktopdir@
 docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 execcompdir = @execcompdir@
-have_xsltproc_FALSE = @have_xsltproc_FALSE@
-have_xsltproc_TRUE = @have_xsltproc_TRUE@
+fillupdir = @fillupdir@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = $(docdir)/autodocs
 imagedir = @imagedir@
 includedir = @includedir@
 infodir = @infodir@
@@ -180,11 +156,14 @@
 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@
@@ -201,13 +180,12 @@
 ydatadir = @ydatadir@
 yncludedir = @yncludedir@
 ystartupdir = @ystartupdir@
-htmldir = $(docdir)/autodocs
 html_DATA = index.html $(wildcard *.html)
-CLEANFILES = $(html_DATA)
+CLEANFILES = $(html_DATA) pod2htm*.tmp
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/autodocs-ycp.ami $(am__configure_deps)
        @for dep in $?; do \
          case '$(am__configure_deps)' in \
            *$$dep*) \
@@ -216,9 +194,9 @@
              exit 1;; \
          esac; \
        done; \
-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  ./devtools/skeletons/config/doc/autodocs/Makefile'; \
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/autodocs/Makefile'; \
        cd $(top_srcdir) && \
-         $(AUTOMAKE) --gnu  ./devtools/skeletons/config/doc/autodocs/Makefile
+         $(AUTOMAKE) --gnu  doc/autodocs/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
        @case '$?' in \
@@ -236,15 +214,6 @@
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-mostlyclean-libtool:
-       -rm -f *.lo
-
-clean-libtool:
-       -rm -rf .libs _libs
-
-distclean-libtool:
-       -rm -f libtool
 uninstall-info-am:
 install-htmlDATA: $(html_DATA)
        @$(NORMAL_INSTALL)
@@ -271,6 +240,7 @@
 
 
 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 \
@@ -331,11 +301,11 @@
        @echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-generic clean-libtool mostlyclean-am
+clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-am
        -rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -363,7 +333,7 @@
 
 mostlyclean: mostlyclean-am
 
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+mostlyclean-am: mostlyclean-generic
 
 pdf: pdf-am
 
@@ -375,19 +345,27 @@
 
 uninstall-am: uninstall-htmlDATA uninstall-info-am
 
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-       distclean distclean-generic distclean-libtool 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 installdirs \
-       maintainer-clean maintainer-clean-generic mostlyclean \
-       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-       uninstall uninstall-am uninstall-htmlDATA uninstall-info-am
-
-
-index.html: $(srcdir)/../../src/*.ycp $(srcdir)/../../src/*.pm
-       $(ybindir)/ycpdoc -d. $(srcdir)/../../src/*.{ycp,pm}
+.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 \
+       installdirs maintainer-clean maintainer-clean-generic \
+       mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+       uninstall-am uninstall-htmlDATA uninstall-info-am
+
+
+AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp)
+AUTODOCS_PM  ?= $(wildcard $(srcdir)/../../src/*.pm)
+
+index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM)
+#including *.pm, for the index
+       ${YCPDOC} -d. $^
+       for i in $(AUTODOCS_PM); do \
+               b=`basename $$i`; b=$${b%.pm}; \
+               pod2html --title=$$b --infile=$$i --outfile=$$b.html; \
+               echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \
+       done
 # 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/squid/src/complex.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/complex.ycp?rev=39493&r1=39492&r2=39493&view=diff
==============================================================================
--- trunk/squid/src/complex.ycp (original)
+++ trunk/squid/src/complex.ycp Wed Jul 18 12:11:42 2007
@@ -41,6 +41,17 @@
 
 include "squid/helps.ycp";
 
+
+/**
+ * Returns a widget with setting of units
+ */
+term unitWidget(string id)
+{
+    return `ComboBox(`id(id), " ",
+                [`item("KB"), `item("MB")]);
+}
+
+
 /**
  * Return a modification status
  * @return true if data was modified
@@ -80,59 +91,115 @@
     return ret ? `next : `abort;
 }
 
-/**
- * Summary dialog
- * @return dialog result
- */
-any SummaryDialog() {
-
-    /* Squid summary dialog caption */
-    string caption = _("Squid Configuration");
+any BaseDialog(){
+    any ret = nil;
+    term dialog_contents =
+        `VBox(
+            `Left(`Label( _("HTTP Ports"))),
+            `Table(`header("Host","Port","Options")),
+            `HBox(
+                `PushButton(`id(`add), _("Add")),
+                `PushButton(`id(`del), _("Del")),
+                `PushButton(`id(`modify), _("Modify")),
+                `HStretch()
+            ),
+            `HBox(
+                `Label( _("Language of error messages:")),
+                `ComboBox(`id("error_language"),
+                              "",
+                              [ `item("aaa"),`item("bbb",true)]),
+                `HStretch()
+            )
+        );
+
+    Wizard::SetContentsButtons("Squid Configuration", dialog_contents, "help text ad",
+        Label::BackButton(), Label::NextButton());
+
+    while (true){
+        ret = UI::UserInput();
+
+        y2debug("BaseDialog(): ret == %1",ret);
+
+        if (ret == `next) break;
+        else if (ret == `abort || ret == `back || ret == `cancel){
+            //if (Popup::ReallyAbort(true)) break;
+            break;
+            continue;
+        }
+    }
 
-    /* FIXME */
-    list summary = Squid::Summary();
-    list unconfigured = summary[1]:[];
-    string configured = summary[0]:"";
-
-    /* Frame label */
-    term contents = Wizard_hw::DetectedContent(_("Squid to Configure"),
-           unconfigured, false, configured);
+    return ret;
+}
 
-    Wizard::SetContentsButtons(caption, contents, HELPS["summary"]:"",
-           Label::BackButton(), Label::FinishButton());
 
+any CacheDialog(){
     any ret = nil;
-    while(true) {
-
-       ret = UI::UserInput();
-
-       /* abort? */
-       if(ret == `abort || ret == `cancel || ret == `back) {
-           if(ReallyAbort()) break;
-           else continue;
-       }
-        /* overview dialog */
-        else if(ret == `edit_button) {
-            ret = `overview;
+    term dialog_contents =
+        `VBox(
+            `Left(`Label( _("Refresh Patterns"))),
+            `Table(`id("refresh_patterns"), `header("Regular Expression", "Min", "Precent", "Max", "Options")),
+            `HBox(
+                `PushButton(`id(`add), _("Add")),
+                `PushButton(`id(`del), _("Del")),
+                `PushButton(`id(`modify), _("Modify")),
+                `HStretch()
+            ),
+            `Left(`Frame("Cache Setting",
+                `VBox(
+                    `HBox(
+                        `HSquash(`TextEntry(`id("cache_mem"), `opt(`shrinkable), "Cache Memory", "")),
+                        unitWidget("cache_mem_units"),
+                        `HStretch()
+                    ),
+                    `HBox(
+                        `HSquash(`TextEntry(`id("cache_max_object_size"), `opt(`shrinkable), "Max Object Size", "")),
+                        unitWidget("cache_max_object_size_units"),
+                        `HSpacing(),
+                        `HSquash(`TextEntry(`id("cache_min_object_size"), `opt(`shrinkable),"Min Object Size", "")),
+                        unitWidget("cache_min_object_size_units"),
+                        `HStretch()
+                    ),
+                    `VSquash(`HBox(
+                        `HSquash(`IntField(`id("cache_swap_low"), "Swap Low-Water Mark", 1, 100, 10)),
+                        `Bottom(`Label("%")),
+                        `HSpacing(),
+                        `HSquash(`IntField(`id("cache_swap_high"), "Swap High-Water Mark", 1, 100, 10)),
+                        `Bottom(`Label("%")),
+                        `HStretch()
+                    )),
+                    `Left(`HBox(
+                        `ComboBox(`id("cache_replacement_policy"),
+                                  "Cache Replacement Policy",
+                                  [`item("lru"), `item("heap GDSF"), `item("heap LFUDA"), `item("heap LRU")]),
+                        `ComboBox(`id("memory_replacement_policy"),
+                                  "Memory Replacement Policy",
+                                  [`item("lru"), `item("heap GDSF"), `item("heap LFUDA"), `item("heap LRU")])
+                    )),
+                    `VSquash(`HBox(
+                        `TextEntry(`id("cache_dir"), "Cache Directory", ""),
+                        `Bottom(`PushButton(`id(`cache_dir), "Advanced Setting"))
+                    ))
+                )
+            ))
+        );
+
+    Wizard::SetContentsButtons("Squid - Cache Setting", dialog_contents, "help",
+        Label::BackButton(), Label::NextButton());
+
+    UI::ChangeWidget(`id("cache_mem"), `ValidChars, "0123456789");
+    UI::ChangeWidget(`id("cache_max_object_size"), `ValidChars, "0123456789");
+    UI::ChangeWidget(`id("cache_min_object_size"), `ValidChars, "0123456789");
+    UI::ChangeWidget(`id("cache_mem_units"), `Items, [`item("B"),`item("KB",true), `item("MB")]);
+
+    while (true){
+        ret = UI::UserInput();
+
+        y2debug("BaseDialog(): ret == %1",ret);
+
+        if (ret == `next || ret == `back) break;
+        else if (ret == `abort || ret == `cancel){
+            //if (Popup::ReallyAbort(true)) break;
             break;
-        }
-        /* configure the selected device */
-        else if(ret == `configure_button) {
-           // TODO FIXME: check for change of the configuration
-            any selected = UI::QueryWidget(`id(`detected_selbox), `CurrentItem);
-            if(selected == `other) {
-                ret = `other;
-            }
-            else {
-                ret = `configure;
-            }
-            break;
-        }
-        else if(ret == `next) {
-            break;
-        }
-        else {
-            y2error("unexpected retcode: %1", ret);
             continue;
         }
     }
@@ -140,60 +207,112 @@
     return ret;
 }
 
-/**
- * Overview dialog
- * @return dialog result
- */
-any OverviewDialog() {
-
-    /* Squid overview dialog caption */
-    string caption = _("Squid Overview");
 
-    list overview = Squid::Overview();
+any AccessControlDialog(){
+    any ret = nil;
+    term dialog_contents =
+        `VBox(
+            `Left(`Label("ACL Groups")),
+            `Table(`id("acl"), `header("Name", "Type", "Description")),
+            `HBox(
+                `PushButton(`id(`add_acl), "Add"),
+                `PushButton(`id(`del_acl), "Del"),
+                `PushButton(`id(`modify_acl), "Modify"),
+                `HStretch()
+            ),
+
+            `VSpacing(),
+
+            `Left(`Label("Access Control")),
+            `HBox(
+                `Table(`id("http_access"), `header("Allow/Deny", "ACL Groups")),
+                `HSquash(`VBox(
+                    `HWeight(1, `PushButton(`id(`up_http_access), "Up")),
+                    `HWeight(1, `PushButton(`id(`down_http_access), "Down"))
+                ))
+            ),
+            `HBox(
+                `PushButton(`id(`add_http_access), "Add"),
+                `PushButton(`id(`del_http_access), "Del"),
+                `PushButton(`id(`modify_http_access), "Modify"),
+                `HStretch()
+            )
+        );
+
+    Wizard::SetContentsButtons("caption", dialog_contents, "help",
+        Label::BackButton(), Label::NextButton());
+
+    while (true){
+        ret = UI::UserInput();
+
+        y2debug("BaseDialog(): ret == %1",ret);
+
+        if (ret == `next || ret == `back) break;
+        else if (ret == `abort || ret == `cancel){
+            //if (Popup::ReallyAbort(true)) break;
+            break;
+            continue;
+        }
+    }
 
-    /* FIXME table header */
-    term contents = Wizard_hw::ConfiguredContent(
-       /* Table header */
-       `header(_("Number"), _("Squid")),
-       overview, nil, nil, nil, nil );
+    return ret;
+}
 
-    contents = Wizard_hw::SpacingAround(contents, 1.5, 1.5, 1.0, 1.0);
 
-    Wizard::SetContentsButtons(caption, contents, HELPS["overview"]:"",
-           Label::BackButton(), Label::FinishButton());
 
+any MiscellaneousDialog()
+{
     any ret = nil;
-    while(true) {
-
-       ret = UI::UserInput();
+    term dialog_contents =
+        `Top(`VBox(
 
-       /* abort? */
-       if(ret == `abort || ret == `cancel) {
-           if(ReallyAbort()) break;
-           else continue;
-       }
-        /* add */
-        else if(ret == `add_button) {
-           /* FIXME */
-            ret = `add;
-            break;
-        }
-        /* edit */
-        else if(ret == `edit_button) {
-           /* FIXME */
-            ret = `edit;
+            `Left(`Frame("Miscellaneous",
+                `VBox(
+                    `Left(`HSquash(`TextEntry(`id("cache_mgr"), "Administrator's e-mail", ""))),
+                    `Left(`CheckBox(`id("ftp_pasive_mode"), "Use Ftp Pasive Mode"))
+                )
+            )),
+
+            `VSpacing(),
+
+            `Left(`Frame("Logging",
+                `VBox(
+                    `HSquash(`TextEntry(`id("access_log"), "Access Log" , "")),
+                    `HSquash(`TextEntry(`id("cache_log"), "Cache Log", "")),
+                    `HSquash(`TextEntry(`id("cache_store_log"), "Cache Store Log", "")),
+                    `HSquash(`TextEntry(`id("cache_swap_log"), "Cache Swap Log", "")),
+                    `Left(`CheckBox(`id("emulate_httpd_log"), "Emulate Httpd Log?"))
+                )
+            )),
+
+            `VSpacing(),
+
+            `Left(`Frame("Timeouts",
+                `VBox(
+                    `HBox(
+                       `HSquash(`TextEntry(`id("connect_timeout"), "Connection timeout", "")),
+                       `ComboBox(`id("connect_timeout_units"), " ", [`item("seconds"), `item("minutes")])
+                    ),
+                    `HBox(
+                       `HSquash(`TextEntry(`id("client_lifetime"), "Client Lifetime", "")),
+                       `ComboBox(`id("client_lifetime_units"), " ", [`item("seconds"), `item("minutes")])
+                    )
+                )
+            ))
+        ));
+
+    Wizard::SetContentsButtons("Squid - Miscellaneous Setting", dialog_contents, "help",
+        Label::BackButton(), Label::NextButton());
+
+    while (true){
+        ret = UI::UserInput();
+
+        y2debug("BaseDialog(): ret == %1",ret);
+
+        if (ret == `next || ret == `back) break;
+        else if (ret == `abort || ret == `cancel){
+            //if (Popup::ReallyAbort(true)) break;
             break;
-        }
-        /* delete */
-        else if(ret == `delete_button) {
-           /* FIXME */
-            continue;
-        }
-        else if(ret == `next || ret == `back) {
-            break;
-        }
-        else {
-            y2error("unexpected retcode: %1", ret);
             continue;
         }
     }
@@ -201,5 +320,5 @@
     return ret;
 }
 
-/* EOF */
 }
+/* vim: set sw=4 ts=4 et ft=ycp : */

Modified: trunk/squid/src/dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/dialogs.ycp?rev=39493&r1=39492&r2=39493&view=diff
==============================================================================
--- trunk/squid/src/dialogs.ycp (original)
+++ trunk/squid/src/dialogs.ycp Wed Jul 18 12:11:42 2007
@@ -113,3 +113,4 @@
 
 /* EOF */
 }
+/* vim: set sw=4 ts=4 et ft=ycp : */

Modified: trunk/squid/src/squid.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/squid.ycp?rev=39493&r1=39492&r2=39493&view=diff
==============================================================================
--- trunk/squid/src/squid.ycp (original)
+++ trunk/squid/src/squid.ycp Wed Jul 18 12:11:42 2007
@@ -53,8 +53,8 @@
     /* Command line help text for the Xsquid module */
     "help"   : _("Configuration of squid"),
     "guihandler"        : SquidSequence,
-    "initialize"        : Squid::Read,
-    "finish"            : Squid::Write,
+//"initialize"        : Squid::Read,
+//    "finish"            : Squid::Write,
     "actions"           : $[
        // FIXME TODO: fill the functionality description here
     ],
@@ -91,3 +91,4 @@
 
 /* EOF */
 }
+/* vim: set sw=4 ts=4 et ft=ycp : */

Modified: trunk/squid/src/wizards.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/wizards.ycp?rev=39493&r1=39492&r2=39493&view=diff
==============================================================================
--- trunk/squid/src/wizards.ycp (original)
+++ trunk/squid/src/wizards.ycp Wed Jul 18 12:11:42 2007
@@ -73,16 +73,40 @@
 
     /* FIXME: adapt to your needs */
     map aliases = $[
+        "base"   : ``(BaseDialog()),
+        "cache"  : ``(CacheDialog()),
+        "access" : ``(AccessControlDialog()),
+        "miscellaneous" : ``(MiscellaneousDialog())
+    ];
+    /*
        "summary"     :   ``( SummaryDialog() ),
        "overview"    :   ``( OverviewDialog() ),
        "configure"   : [ ``( AddSequence() ), true ],
        "add"         : [ ``( AddSequence() ), true ],
        "edit"                : [ ``( AddSequence() ), true ]
     ];
+    */
 
     /* FIXME: adapt to your needs */
     map sequence = $[
-       "ws_start" : "summary",
+       "ws_start" : "base",
+    "base" : $[
+        `abort : `abort,
+        `next  : "cache"
+    ],
+    "cache" : $[
+        `abort : `abort,
+        `next  : "access"
+    ],
+    "access" : $[
+        `abort : `abort,
+        `next  : "miscellaneous"
+    ],
+    "miscellaneous" : $[
+        `abort : `abort,
+        `next : `next
+    ]
+    /*
        "summary" : $[
            `abort      : `abort,
            `next       : `next,
@@ -108,6 +132,7 @@
            `abort      : `abort,
            `next       : "overview",
        ]
+    */
     ];
 
     any ret = Sequencer::Run(aliases, sequence);
@@ -122,25 +147,25 @@
 any SquidSequence() {
 
     map aliases = $[
-       "read"        : [ ``( ReadDialog() ), true ],
-       "main"        :   ``( MainSequence() ),
-       "write"       : [ ``( WriteDialog() ), true ]
+//"read"     : [ ``( ReadDialog() ), true ],
+       "main"        :   ``( MainSequence() )
+//     "write"       : [ ``( WriteDialog() ), true ]
     ];
 
     map sequence = $[
-       "ws_start" : "read",
+       "ws_start" : "main",/*
        "read" : $[
            `abort      : `abort,
            `next       : "main"
-       ],
+       ],*/
        "main" : $[
            `abort      : `abort,
-           `next       : "write"
-       ],
+           `next       : `next
+       ] /*,
        "write" : $[
            `abort      : `abort,
            `next       : `next
-       ]
+       ]*/
     ];
 
     Wizard::CreateDialog();
@@ -175,3 +200,4 @@
 
 /* EOF */
 }
+/* vim: set sw=4 ts=4 et ft=ycp : */

Modified: trunk/squid/testsuite/Makefile
URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/testsuite/Makefile?rev=39493&r1=39492&r2=39493&view=diff
==============================================================================
--- trunk/squid/testsuite/Makefile (original)
+++ trunk/squid/testsuite/Makefile Wed Jul 18 12:11:42 2007
@@ -1,5 +1,5 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
-# ./devtools/skeletons/config/testsuite/Makefile.  Generated from Makefile.in by configure.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# testsuite/Makefile.  Generated from Makefile.in by configure.
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 # 2003, 2004, 2005  Free Software Foundation, Inc.
@@ -20,12 +20,12 @@
 # Do not edit this file (Makefile.am) as it will be overwritten!
 #
 srcdir = .
-top_srcdir = ../../../..
+top_srcdir = ..
 
-pkgdatadir = $(datadir)/yast2-devtools
-pkglibdir = $(libdir)/yast2-devtools
-pkgincludedir = $(includedir)/yast2-devtools
-top_builddir = ../../../..
+pkgdatadir = $(datadir)/yast2-squid
+pkglibdir = $(libdir)/yast2-squid
+pkgincludedir = $(includedir)/yast2-squid
+top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = /usr/bin/install -c -p
 install_sh_DATA = $(install_sh) -c -m 644
@@ -39,14 +39,13 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = ia64-suse-linux
-host_triplet = ia64-suse-linux
-target_triplet = ia64-suse-linux
-subdir = ./devtools/skeletons/config/testsuite
+build_triplet = x86_64-suse-linux-gnu
+host_triplet = x86_64-suse-linux-gnu
+target_triplet = x86_64-suse-linux-gnu
+subdir = testsuite
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-       $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -58,119 +57,84 @@
 EXPECT = expect
 RUNTEST = runtest
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /local/yast2/trunk/devtools/missing --run aclocal-1.9
-AMDEP_FALSE = #
-AMDEP_TRUE = 
-AMTAR = ${SHELL} /local/yast2/trunk/devtools/missing --run tar
-AR = ar
-AUTOCONF = ${SHELL} /local/yast2/trunk/devtools/missing --run autoconf
-AUTOHEADER = ${SHELL} /local/yast2/trunk/devtools/missing --run autoheader
-AUTOMAKE = ${SHELL} /local/yast2/trunk/devtools/missing --run automake-1.9
+ACLOCAL = ${SHELL} /home/dfiser/yast/squid/missing --run aclocal-1.9
+AMTAR = ${SHELL} /home/dfiser/yast/squid/missing --run tar
+AUTOCONF = ${SHELL} /home/dfiser/yast/squid/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/dfiser/yast/squid/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/dfiser/yast/squid/missing --run automake-1.9
 AWK = gawk
-CAT_ENTRY_END = -->
-CAT_ENTRY_START = <!--
-CC = gcc
-CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2
-CPP = gcc -E
-CPPFLAGS = 
-CREATE_PKGCONFIG_FALSE = #
-CREATE_PKGCONFIG_TRUE = 
-CXX = g++
-CXXCPP = g++ -E
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O2
+CREATE_PKGCONFIG_FALSE = 
+CREATE_PKGCONFIG_NOARCH_FALSE = 
+CREATE_PKGCONFIG_NOARCH_TRUE = #
+CREATE_PKGCONFIG_TRUE = #
 CYGPATH_W = echo
-DEFS = -DPACKAGE_NAME=\"yast2-devtools\" -DPACKAGE_TARNAME=\"yast2-devtools\" -DPACKAGE_VERSION=\"2.12.0\" -DPACKAGE_STRING=\"yast2-devtools\ 2.12.0\" -DPACKAGE_BUGREPORT=\"http://www.suse.de/feedback\" -DPACKAGE=\"yast2-devtools\" -DVERSION=\"2.12.0\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 ;
-DEPDIR = .deps
-DOCBOOK_ROOT = 
-ECHO = echo
+DEFS = -DPACKAGE_NAME=\"yast2-squid\" -DPACKAGE_TARNAME=\"yast2-squid\" -DPACKAGE_VERSION=\"2.13.0\" -DPACKAGE_STRING=\"yast2-squid\ 2.13.0\" -DPACKAGE_BUGREPORT=\"http://bugs.opensuse.org/\" -DPACKAGE=\"yast2-squid\" -DVERSION=\"2.13.0\";
 ECHO_C = 
 ECHO_N = -n
 ECHO_T = 
-EGREP = grep -E
-EXEEXT = 
-F77 = g77
-FFLAGS = -g -O2
 INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
-LDFLAGS = 
 LIBOBJS = 
 LIBS = 
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
 LN_S = ln -s
 LTLIBOBJS = 
-MAINTAINER = Martin Vidner <mvidner@xxxxxxx>
-MAKEINFO = ${SHELL} /local/yast2/trunk/devtools/missing --run makeinfo
-OBJEXT = o
-PACKAGE = yast2-devtools
-PACKAGE_BUGREPORT = http://www.suse.de/feedback
-PACKAGE_NAME = yast2-devtools
-PACKAGE_STRING = yast2-devtools 2.12.0
-PACKAGE_TARNAME = yast2-devtools
-PACKAGE_VERSION = 2.12.0
+MAINTAINER = Daniel Fiser <dfiser@xxxxxxx>
+MAKEINFO = ${SHELL} /home/dfiser/yast/squid/missing --run makeinfo
+PACKAGE = yast2-squid
+PACKAGE_BUGREPORT = http://bugs.opensuse.org/
+PACKAGE_NAME = yast2-squid
+PACKAGE_STRING = yast2-squid 2.13.0
+PACKAGE_TARNAME = yast2-squid
+PACKAGE_VERSION = 2.13.0
 PATH_SEPARATOR = :
-PERL = perl
-PKG_CONFIG_PATH = /usr/local/lib/pkgconfig:/usr/lib/pkgconfig:/opt/gnome/lib/pkgconfig
-RANLIB = ranlib
-RPMNAME = yast2-devtools
+PKG_CONFIG_PATH = /usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig:/opt/kde3/lib64/pkgconfig:/opt/gnome/lib64/pkgconfig:/opt/gnome/lib64/pkgconfig:/opt/gnome/share/pkgconfig
+RPMNAME = yast2-squid
 SET_MAKE = 
 SHELL = /bin/sh
-STRIP = strip
+STRIP = 
 STYLESHEET_CSS = /usr/share/YaST2/data/docbook/css/yast2docs.css
 STYLESHEET_HTML = /usr/share/YaST2/data/docbook/stylesheets/customize-html.xsl
 STYLESHEET_PDF = /usr/share/YaST2/data/docbook/stylesheets/customize-fo.xsl
 STYLESHEET_YCPDOC = /usr/share/YaST2/data/docbook/stylesheets/ycpdoc.xsl
 STYLESHEET_YDOC = /usr/share/YaST2/data/docbook/stylesheets/ydoc.xsl
-VERSION = 2.12.0
+VERSION = 2.13.0
 XGETTEXT = /usr/bin/xgettext
-XML_CATALOG = /etc/xml/catalog
-XSLTPROC = /usr/bin/xsltproc
-XSLTPROC_FLAGS = --nonet
-YAST2DEVTOOLS = ${prefix}/share/YaST2/data/devtools
-YCPDOC = ./ycpdoc/src/ycpdoc
-ac_ct_AR = ar
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_F77 = g77
-ac_ct_RANLIB = ranlib
-ac_ct_STRIP = strip
+Y2DEVTOOLS_PREFIX = /usr
+YCPC = /usr/bin/ycpc
+YCPDOC = /usr/lib/YaST2/bin/ycpdoc
+YCPMAKEDEP = /usr/lib/YaST2/bin/ycpmakedep
 agentdir = ${prefix}/lib/YaST2/servers_non_y2
-am__fastdepCC_FALSE = #
-am__fastdepCC_TRUE = 
-am__fastdepCXX_FALSE = #
-am__fastdepCXX_TRUE = 
-am__include = include
 am__leading_dot = .
-am__quote = 
 am__tar = tar --format=ustar -chf - "$$tardir"
 am__untar = tar -xf -
 bindir = ${exec_prefix}/bin
-build = ia64-suse-linux
+build = x86_64-suse-linux-gnu
 build_alias = 
-build_cpu = ia64
-build_os = linux
+build_cpu = x86_64
+build_os = linux-gnu
 build_vendor = suse
 clientdir = ${prefix}/share/YaST2/clients
-datadir = ${prefix}/share
+datadir = ${datarootdir}
+datarootdir = ${prefix}/share
 desktopdir = ${prefix}/share/applications/YaST2
-docdir = ${prefix}/share/doc/packages/yast2-devtools
+docdir = ${prefix}/share/doc/packages/yast2-squid
+dvidir = ${docdir}
 exec_prefix = ${prefix}
 execcompdir = ${prefix}/lib/YaST2
-have_xsltproc_FALSE = #
-have_xsltproc_TRUE = 
-host = ia64-suse-linux
+fillupdir = /var/adm/fillup-templates
+host = x86_64-suse-linux-gnu
 host_alias = 
-host_cpu = ia64
-host_os = linux
+host_cpu = x86_64
+host_os = linux-gnu
 host_vendor = suse
+htmldir = ${docdir}
 imagedir = ${prefix}/share/YaST2/images
 includedir = ${prefix}/include/YaST2
-infodir = ${prefix}/info
-install_sh = /local/yast2/trunk/devtools/install-sh
-libdir = /usr/lib
+infodir = ${datarootdir}/info
+install_sh = /home/dfiser/yast/squid/install-sh
+libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${prefix}/share/YaST2/locale
 localstatedir = ${prefix}/var
@@ -178,20 +142,23 @@
 mkdir_p = mkdir -p --
 moduledir = ${prefix}/share/YaST2/modules
 oldincludedir = /usr/include
+pdfdir = ${docdir}
+pkgconfigdatadir = ${datadir}/pkgconfig
 pkgconfigdir = ${libdir}/pkgconfig
 plugindir = ${libdir}/YaST2/plugin
 potdir = ${docdir}/pot
 prefix = /usr
 program_transform_name = s,x,x,
+psdir = ${docdir}
 sbindir = ${exec_prefix}/sbin
 schemadir = ${prefix}/share/YaST2/schema
 scrconfdir = ${prefix}/share/YaST2/scrconf
 sharedstatedir = ${prefix}/com
 sysconfdir = ${prefix}/etc
-target = ia64-suse-linux
+target = x86_64-suse-linux-gnu
 target_alias = 
-target_cpu = ia64
-target_os = linux
+target_cpu = x86_64
+target_os = linux-gnu
 target_vendor = suse
 themedir = ${prefix}/share/YaST2/theme
 yast2dir = ${prefix}/share/YaST2
@@ -214,9 +181,9 @@
              exit 1;; \
          esac; \
        done; \
-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  ./devtools/skeletons/config/testsuite/Makefile'; \
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  testsuite/Makefile'; \
        cd $(top_srcdir) && \
-         $(AUTOMAKE) --gnu  ./devtools/skeletons/config/testsuite/Makefile
+         $(AUTOMAKE) --gnu  testsuite/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
        @case '$?' in \
@@ -234,15 +201,6 @@
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-mostlyclean-libtool:
-       -rm -f *.lo
-
-clean-libtool:
-       -rm -rf .libs _libs
-
-distclean-libtool:
-       -rm -f libtool
 uninstall-info-am:
 tags: TAGS
 TAGS:
@@ -346,12 +304,11 @@
        @echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-generic clean-libtool clean-local mostlyclean-am
+clean-am: clean-generic clean-local mostlyclean-am
 
 distclean: distclean-am
        -rm -f Makefile
-distclean-am: clean-am distclean-DEJAGNU distclean-generic \
-       distclean-libtool
+distclean-am: clean-am distclean-DEJAGNU distclean-generic
 
 dvi: dvi-am
 
@@ -379,7 +336,7 @@
 
 mostlyclean: mostlyclean-am
 
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+mostlyclean-am: mostlyclean-generic
 
 pdf: pdf-am
 
@@ -392,14 +349,13 @@
 uninstall-am: uninstall-info-am
 
 .PHONY: all all-am all-local check check-DEJAGNU check-am check-local \
-       clean clean-generic clean-libtool clean-local distclean \
-       distclean-DEJAGNU distclean-generic distclean-libtool 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-strip \
-       installcheck installcheck-am installdirs maintainer-clean \
-       maintainer-clean-generic mostlyclean mostlyclean-generic \
-       mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+       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-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
 
 

Modified: trunk/squid/testsuite/Makefile.in
URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/testsuite/Makefile.in?rev=39493&r1=39492&r2=39493&view=diff
==============================================================================
--- trunk/squid/testsuite/Makefile.in (original)
+++ trunk/squid/testsuite/Makefile.in Wed Jul 18 12:11:42 2007
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -25,7 +25,7 @@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../../..
+top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
@@ -42,11 +42,10 @@
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-subdir = ./devtools/skeletons/config/testsuite
+subdir = testsuite
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-       $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -59,52 +58,30 @@
 RUNTEST = runtest
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
-AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-CAT_ENTRY_END = @CAT_ENTRY_END@
-CAT_ENTRY_START = @CAT_ENTRY_START@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
 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@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOCBOOK_ROOT = @DOCBOOK_ROOT@
-ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINTAINER = @MAINTAINER@
 MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -112,9 +89,7 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-RANLIB = @RANLIB@
 RPMNAME = @RPMNAME@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -126,25 +101,12 @@
 STYLESHEET_YDOC = @STYLESHEET_YDOC@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
-XML_CATALOG = @XML_CATALOG@
-XSLTPROC = @XSLTPROC@
-XSLTPROC_FLAGS = @XSLTPROC_FLAGS@
-YAST2DEVTOOLS = @YAST2DEVTOOLS@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
+YCPC = @YCPC@
 YCPDOC = @YCPDOC@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
+YCPMAKEDEP = @YCPMAKEDEP@
 agentdir = @agentdir@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
 am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -155,17 +117,19 @@
 build_vendor = @build_vendor@
 clientdir = @clientdir@
 datadir = @datadir@
+datarootdir = @datarootdir@
 desktopdir = @desktopdir@
 docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 execcompdir = @execcompdir@
-have_xsltproc_FALSE = @have_xsltproc_FALSE@
-have_xsltproc_TRUE = @have_xsltproc_TRUE@
+fillupdir = @fillupdir@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 imagedir = @imagedir@
 includedir = @includedir@
 infodir = @infodir@
@@ -178,11 +142,14 @@
 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@
@@ -214,9 +181,9 @@
              exit 1;; \
          esac; \
        done; \
-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  ./devtools/skeletons/config/testsuite/Makefile'; \
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  testsuite/Makefile'; \
        cd $(top_srcdir) && \
-         $(AUTOMAKE) --gnu  ./devtools/skeletons/config/testsuite/Makefile
+         $(AUTOMAKE) --gnu  testsuite/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
        @case '$?' in \
@@ -234,15 +201,6 @@
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-mostlyclean-libtool:
-       -rm -f *.lo
-
-clean-libtool:
-       -rm -rf .libs _libs
-
-distclean-libtool:
-       -rm -f libtool
 uninstall-info-am:
 tags: TAGS
 TAGS:
@@ -346,12 +304,11 @@
        @echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-generic clean-libtool clean-local mostlyclean-am
+clean-am: clean-generic clean-local mostlyclean-am
 
 distclean: distclean-am
        -rm -f Makefile
-distclean-am: clean-am distclean-DEJAGNU distclean-generic \
-       distclean-libtool
+distclean-am: clean-am distclean-DEJAGNU distclean-generic
 
 dvi: dvi-am
 
@@ -379,7 +336,7 @@
 
 mostlyclean: mostlyclean-am
 
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+mostlyclean-am: mostlyclean-generic
 
 pdf: pdf-am
 
@@ -392,14 +349,13 @@
 uninstall-am: uninstall-info-am
 
 .PHONY: all all-am all-local check check-DEJAGNU check-am check-local \
-       clean clean-generic clean-libtool clean-local distclean \
-       distclean-DEJAGNU distclean-generic distclean-libtool 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-strip \
-       installcheck installcheck-am installdirs maintainer-clean \
-       maintainer-clean-generic mostlyclean mostlyclean-generic \
-       mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+       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-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
 
 

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages