Thread: [Pikloops-svn] SF.net SVN: pikloops: [57] prog/trunk
Brought to you by:
dionysos-sf
Menu
▾
▴
pikloops-svn
|
From: <dio...@us...> - 2007-07-09 08:53:52
|
Revision: 57
http://pikloops.svn.sourceforge.net/pikloops/?rev=57&view=rev
Author: dionysos-sf
Date: 2007-07-09 01:53:53 -0700 (Mon, 09 Jul 2007)
Log Message:
-----------
Change maintener email.
Modified Paths:
--------------
prog/trunk/AUTHORS
prog/trunk/ChangeLog
prog/trunk/authors.xml
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-07-23 10:24:44
|
Revision: 77
http://pikloops.svn.sourceforge.net/pikloops/?rev=77&view=rev
Author: dionysos-sf
Date: 2007-07-23 03:24:45 -0700 (Mon, 23 Jul 2007)
Log Message:
-----------
New version: 0.2.3
Modified Paths:
--------------
prog/trunk/configure
prog/trunk/configure.in
prog/trunk/configure.in.in
Modified: prog/trunk/configure
===================================================================
--- prog/trunk/configure 2007-07-23 10:21:26 UTC (rev 76)
+++ prog/trunk/configure 2007-07-23 10:24:45 UTC (rev 77)
@@ -1953,7 +1953,7 @@
# Define the identity of the package.
PACKAGE=pikloops
- VERSION=0.2.2
+ VERSION=0.2.3
cat >>confdefs.h <<_ACEOF
@@ -34058,7 +34058,6 @@
$ac_cs_success || { (exit 1); exit 1; }
fi
-
if test "$all_tests" = "bad"; then
if test ! "$cache_file" = "/dev/null"; then
echo ""
Modified: prog/trunk/configure.in
===================================================================
--- prog/trunk/configure.in 2007-07-23 10:21:26 UTC (rev 76)
+++ prog/trunk/configure.in 2007-07-23 10:24:45 UTC (rev 77)
@@ -40,7 +40,7 @@
AC_ARG_PROGRAM
dnl Automake doc recommends to do this only here. (Janos)
-AM_INIT_AUTOMAKE(pikloops, 0.2.2) dnl searches for some needed programs
+AM_INIT_AUTOMAKE(pikloops, 0.2.3) dnl searches for some needed programs
KDE_SET_PREFIX
@@ -82,10 +82,9 @@
AC_CONFIG_FILES([ po/Makefile ])
AC_CONFIG_FILES([ src/Makefile ])
AC_OUTPUT
-
if test "$all_tests" = "bad"; then
if test ! "$cache_file" = "/dev/null"; then
- echo ""
+ echo ""
echo "Please remove the file $cache_file after changing your setup"
echo "so that configure will find the changes next time."
echo ""
Modified: prog/trunk/configure.in.in
===================================================================
--- prog/trunk/configure.in.in 2007-07-23 10:21:26 UTC (rev 76)
+++ prog/trunk/configure.in.in 2007-07-23 10:24:45 UTC (rev 77)
@@ -1,6 +1,6 @@
#MIN_CONFIG(3)
-AM_INIT_AUTOMAKE(pikloops,0.2.2)
+AM_INIT_AUTOMAKE(pikloops,0.2.3)
dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __kdevelop[noopt]__
dnl CFLAGS="$NOOPT_CFLAGS" dnl __kdevelop[noopt]__
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-17 09:13:20
|
Revision: 160
http://pikloops.svn.sourceforge.net/pikloops/?rev=160&view=rev
Author: dionysos-sf
Date: 2007-10-17 02:13:22 -0700 (Wed, 17 Oct 2007)
Log Message:
-----------
Remove files that don't have to be in repository.
Removed Paths:
-------------
prog/trunk/Makefile.in
prog/trunk/acinclude.m4
prog/trunk/configure.in
prog/trunk/doc/Makefile.in
prog/trunk/doc/en/Makefile.in
prog/trunk/doc/fr/Makefile.in
prog/trunk/pikloops.kdevses
prog/trunk/po/Makefile.in
prog/trunk/src/Makefile.in
Deleted: prog/trunk/Makefile.in
===================================================================
--- prog/trunk/Makefile.in 2007-10-17 09:04:00 UTC (rev 159)
+++ prog/trunk/Makefile.in 2007-10-17 09:13:22 UTC (rev 160)
@@ -1,900 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 435799 $
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 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.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-####### kdevelop will overwrite this part!!! (begin)##########
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
-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
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL TODO \
- admin/ChangeLog admin/compile admin/config.guess \
- admin/config.sub admin/depcomp admin/install-sh \
- admin/ltmain.sh admin/missing admin/mkinstalldirs admin/ylwrap
-subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(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
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_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
-#>+ 6
-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 nmcheck-recursive bcheck-recursive
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 1
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-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
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AUTOCONF = @AUTOCONF@
-AUTODIRS = @AUTODIRS@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOPIDLNG = @DCOPIDLNG@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GMSGFMT = @GMSGFMT@
-HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-KCONFIG_COMPILER = @KCONFIG_COMPILER@
-KDECONFIG = @KDECONFIG@
-KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_USE_FPIE = @KDE_USE_FPIE@
-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-KDE_USE_PIE = @KDE_USE_PIE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LDFLAGS = @LDFLAGS@
-LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
-LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBRESOLV = @LIBRESOLV@
-LIBS = @LIBS@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDED = @LIB_KDED@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KDNSSD = @LIB_KDNSSD@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMPROXY = @LIB_KIMPROXY@
-LIB_KIO = @LIB_KIO@
-LIB_KJS = @LIB_KJS@
-LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUNITTEST = @LIB_KUNITTEST@
-LIB_KUTILS = @LIB_KUTILS@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LIB_XRENDER = @LIB_XRENDER@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-QTE_NORTTI = @QTE_NORTTI@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XMLLINT = @XMLLINT@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-X_RPATH = @X_RPATH@
-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@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-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@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-include_x11_FALSE = @include_x11_FALSE@
-include_x11_TRUE = @include_x11_TRUE@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_kcfgdir = @kde_kcfgdir@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-xdg_appsdir = @xdg_appsdir@
-xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
-SUBDIRS = src po doc
-EXTRA_DIST = pikloops.kdevprj admin AUTHORS COPYING ChangeLog INSTALL README TODO pikloops.lsm pikloops.spec
-
-####### kdevelop will overwrite this part!!! (end)############
-# not a GNU package. You can remove this line, if
-# have all needed files, that a GNU package needs
-AUTOMAKE_OPTIONS = foreign
-MAINTAINERCLEANFILES = subdirs configure.in acinclude.m4 configure.files
-#>- all: config.h
-#>+ 1
-all: docs-am config.h
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
-
-.SUFFIXES:
-am--refresh:
- @:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-#>- @for dep in $?; do \
-#>- case '$(am__configure_deps)' in \
-#>- *$$dep*) \
-#>- echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
-#>- cd $(srcdir) && $(AUTOMAKE) --foreign \
-#>- && exit 0; \
-#>- exit 1;; \
-#>- esac; \
-#>- done; \
-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
-#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --foreign Makefile
-#>+ 14
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
- ( \
- cd $(srcdir) && $(AUTOMAKE) --foreign \
- ) || exit 1; echo ' cd $(top_srcdir) && perl admin/am_edit '; cd $(top_srcdir) && perl admin/am_edit && exit 0; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign Makefile
- cd $(top_srcdir) && perl admin/am_edit Makefile.in
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- echo ' $(SHELL) ./config.status'; \
- $(SHELL) ./config.status;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- $(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure: $(am__configure_deps)
-#>- cd $(srcdir) && $(AUTOCONF)
-#>+ 2
- cd $(srcdir) && rm -f configure
- cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.h: stamp-h1
- @if test ! -f $@; then \
- rm -f stamp-h1; \
- $(MAKE) stamp-h1; \
- else :; fi
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
- @rm -f stamp-h1
- cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in: $(am__configure_deps)
- cd $(top_srcdir) && $(AUTOHEADER)
- rm -f stamp-h1
- touch $@
-
-distclean-hdr:
- -rm -f config.h stamp-h1
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-
-distclean-libtool:
- -rm -f libtool
-uninstall-info-am:
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-# (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'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- dot_seen=yes; \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- (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'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- rev=''; for subdir in $$list; do \
- if test "$$subdir" = "."; then :; else \
- rev="$$subdir $$rev"; \
- fi; \
- done; \
- rev="$$rev ."; \
- target=`echo $@ | sed s/-recursive//`; \
- for subdir in $$rev; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- (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); \
- done
-ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 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; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
- empty_fix=.; \
- else \
- include_option=--include; \
- empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
- list='$(SOURCES) $(HEADERS) config.h.in $(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 \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
- fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) config.h.in $(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" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-
-GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
- && 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)/admin
- @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; \
- 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 \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
- || exit 1; \
- fi; \
- done
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
- distdir=`$(am__cd) $(distdir) && pwd`; \
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$top_distdir" \
- distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
- done
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$(top_distdir)" distdir="$(distdir)" \
- dist-hook
- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -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)
-dist-gzip: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- $(am__remove_distdir)
-
-dist-bzip2: distdir
- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
- $(am__remove_distdir)
-
-dist-tarZ: distdir
- tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
- $(am__remove_distdir)
-
-dist-shar: distdir
- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
- $(am__remove_distdir)
-
-dist-zip: distdir
- -rm -f $(distdir).zip
- zip -rq $(distdir).zip $(distdir)
- $(am__remove_distdir)
-
-dist dist-all: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- $(am__remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration. Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
- case '$(DIST_ARCHIVES)' in \
- *.tar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
- *.tar.bz2*) \
- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.Z*) \
- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
- *.shar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
- *.zip*) \
- unzip $(distdir).zip ;;\
- esac
- chmod -R a-w $(distdir); chmod a+w $(distdir)
- mkdir $(distdir)/_build
- mkdir $(distdir)/_inst
- chmod a-w $(distdir)
- dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
- && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
- && cd $(distdir)/_build \
- && ../configure --srcdir=.. --prefix="$$dc_install_base" \
- $(DISTCHECK_CONFIGURE_FLAGS) \
- && $(MAKE) $(AM_MAKEFLAGS) \
- && $(MAKE) $(AM_MAKEFLAGS) dvi \
- && $(MAKE) $(AM_MAKEFLAGS) check \
- && $(MAKE) $(AM_MAKEFLAGS) install \
- && $(MAKE) $(AM_MAKEFLAGS) installcheck \
- && $(MAKE) $(AM_MAKEFLAGS) uninstall \
- && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
- distuninstallcheck \
- && chmod -R a-w "$$dc_install_base" \
- && ({ \
- (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
- distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
- } || { rm -rf "$$dc_destdir"; exit 1; }) \
- && rm -rf "$$dc_destdir" \
- && $(MAKE) $(AM_MAKEFLAGS) dist \
- && rm -rf $(DIST_ARCHIVES) \
- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
- $(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;}'
-distuninstallcheck:
- @cd $(distuninstallcheck_dir) \
- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
- || { echo "ERROR: files left after uninstall:" ; \
- if test -n "$(DESTDIR)"; then \
- echo " (check DESTDIR support)"; \
- fi ; \
- $(distuninstallcheck_listfiles) ; \
- exit 1; } >&2
-distcleancheck: distclean
- @if test '$(srcdir)' = . ; then \
- echo "ERROR: distcleancheck can only run from a VPATH build" ; \
- exit 1 ; \
- fi
- @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
- || { echo "ERROR: files left in build directory after distclean:" ; \
- $(distcleancheck_listfiles) ; \
- exit 1; } >&2
-check-am: all-am
-check: check-recursive
-all-am: Makefile config.h
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
- -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-#>- clean: clean-recursive
-#>+ 1
-clean: kde-rpo-clean clean-recursive
-
-#>- clean-am: clean-generic clean-libtool mostlyclean-am
-#>+ 1
-clean-am: clean-bcheck clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
- -rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-hdr \
- distclean-libtool distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-recursive
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
- -rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -rf $(top_srcdir)/autom4te.cache
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
- check-am clean clean-generic clean-libtool 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-hdr distclean-libtool \
- distclean-recursive distclean-tags distcleancheck distdir \
- distuninstallcheck 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 \
- installdirs-am maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-generic \
- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
- tags tags-recursive uninstall uninstall-am uninstall-info-am
-
-
-$(top_srcdir)/configure.in: configure.in.in $(top_srcdir)/subdirs
- cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.in ;
-
-$(top_srcdir)/subdirs:
- cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common subdirs
-
-$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in
- @cd $(top_srcdir) && cat admin/acinclude.m4.in admin/libtool.m4.in > acinclude.m4
-
-package-messages:
- $(MAKE) -f admin/Makefile.common package-messages
- $(MAKE) -C po merge
-
-dist-hook:
- cd $(top_distdir) && perl admin/am_edit -padmin
- cd $(top_distdir) && $(MAKE) -f admin/Makefile.common subdirs
-# 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:
-
-clean-bcheck:
- rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-recursive
-
-bcheck-am:
- @for i in ; do \
- if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
- echo "$$i"; \
- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
- rm -f $$i.bchecktest.cc; exit 1; \
- fi ; \
- echo "" >> $$i.bchecktest.cc.class; \
- perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
- rm -f a.out; \
- fi ; \
- done
-
-
-
-#>+ 2
-KDE_DIST=stamp-h.in pikloops.kdevses subdirs Makefile.in grosdiff configure.files pikloops.kdevelop config.h.in pikloops.kdevelop.pcs configure.in aclocal.m4 Makefile.dist Doxyfile configure.in.in configure acinclude.m4 Makefile.am
-
-#>+ 2
-docs-am:
-
-#>+ 7
-force-reedit:
- \
- cd $(srcdir) && $(AUTOMAKE) --foreign \
-
- cd $(top_srcdir) && perl admin/am_edit Makefile.in
-
-
-#>+ 21
-clean-bcheck:
- rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-recursive
-
-bcheck-am:
- @for i in ; do \
- if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
- echo "$$i"; \
- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
- rm -f $$i.bchecktest.cc; exit 1; \
- fi ; \
- echo "" >> $$i.bchecktest.cc.class; \
- perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
- rm -f a.out; \
- fi ; \
- done
-
-
-#>+ 3
-final:
- $(MAKE) all-am
-
-#>+ 3
-final-install:
- $(MAKE) install-am
-
-#>+ 3
-no-final:
- $(MAKE) all-am
-
-#>+ 3
-no-final-install:
- $(MAKE) install-am
-
-#>+ 3
-kde-rpo-clean:
- -rm -f *.rpo
-
-#>+ 3
-nmcheck:
-nmcheck-am: nmcheck
Deleted: prog/trunk/acinclude.m4
===================================================================
--- prog/trunk/acinclude.m4 2007-10-17 09:04:00 UTC (rev 159)
+++ prog/trunk/acinclude.m4 2007-10-17 09:13:22 UTC (rev 160)
@@ -1,11818 +0,0 @@
-## -*- autoconf -*-
-
-dnl This file is part of the KDE libraries/packages
-dnl Copyright (C) 1997 Janos Farkas (ch...@sh...)
-dnl (C) 1997,98,99 Stephan Kulow (co...@kd...)
-
-dnl This file is free software; you can redistribute it and/or
-dnl modify it under the terms of the GNU Library General Public
-dnl License as published by the Free Software Foundation; either
-dnl version 2 of the License, or (at your...
[truncated message content] |
|
From: <dio...@us...> - 2007-10-17 09:35:25
|
Revision: 163
http://pikloops.svn.sourceforge.net/pikloops/?rev=163&view=rev
Author: dionysos-sf
Date: 2007-10-17 02:35:28 -0700 (Wed, 17 Oct 2007)
Log Message:
-----------
Remove files that don't have to be in repository.
Removed Paths:
-------------
prog/trunk/aclocal.m4
prog/trunk/config.h.in
prog/trunk/configure.files
prog/trunk/stamp-h.in
prog/trunk/subdirs
Deleted: prog/trunk/aclocal.m4
===================================================================
--- prog/trunk/aclocal.m4 2007-10-17 09:15:37 UTC (rev 162)
+++ prog/trunk/aclocal.m4 2007-10-17 09:35:28 UTC (rev 163)
@@ -1,863 +0,0 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
-# This file 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.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file 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.
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
- [AM_AUTOMAKE_VERSION([1.9.6])])
-
-# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file 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.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory. The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run. This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-# fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-# fails if $ac_aux_dir is absolute,
-# fails when called from a subdirectory in a VPATH build with
-# a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir. In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
-# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-# MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH. The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# AM_CONDITIONAL -*- Autoconf -*-
-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file 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.
-
-# serial 7
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])
-AC_SUBST([$1_FALSE])
-if $2; then
- $1_TRUE=
- $1_FALSE='#'
-else
- $1_TRUE='#'
- $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
- AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file 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.
-
-# serial 8
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery. Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
- [$1], CXX, [depcc="$CXX" am_compiler_list=],
- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
- [depcc="$$1" am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
- [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
- # We make a subdir and do the tests there. Otherwise we can end up
- # making bogus files that we don't know about and never remove. For
- # instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
- mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
- # using a relative directory.
- cp "$am_depcomp" conftest.dir
- cd conftest.dir
- # We will build objects and dependencies in a subdirectory because
- # it helps to detect inapplicable dependency modes. For instance
- # both Tru64's cc and ICC support -MD to output dependencies as a
- # side effect of compilation, but ICC will put the dependencies in
- # the current directory while Tru64 will put them in the object
- # directory.
- mkdir sub
-
- am_cv_$1_dependencies_compiler_type=none
- if test "$am_compiler_list" = ""; then
- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
- fi
- for depmode in $am_compiler_list; do
- # Setup a source with many dependencies, because some compilers
- # like to wrap large dependency lists on column 80 (with \), and
- # we should not choose a depcomp mode which is confused by this.
- #
- # We need to recreate these files for each test, as the compiler may
- # overwrite some of them when testing with obscure command lines.
- # This happens at least with the AIX C compiler.
- : > sub/conftest.c
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
- case $depmode in
- nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
- if test "x$enable_dependency_tracking" = xyes; then
- continue
- else
- break
- fi
- ;;
- none) break ;;
- esac
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this.
- if depmode=$depmode \
- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
- >/dev/null 2>conftest.err &&
- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- # icc doesn't choke on unknown options, it will just issue warnings
- # or remarks (even with -Werror). So we grep stderr for any message
- # that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
- # icc: Command line warning: ignoring option '-M'; no argument required
- # The diagnosis changed in icc 8.0:
- # icc: Command line remark: option '-MP' not supported
- if (grep 'ignoring option' conftest.err ||
- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
- am_cv_$1_dependencies_compiler_type=$depmode
- break
- fi
- fi
- done
-
- cd ..
- rm -rf conftest.dir
-else
- am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[ --disable-dependency-tracking speeds up one-time build
- --enable-dependency-tracking do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" != xno; then
- am_depcomp="$ac_aux_dir/depcomp"
- AMDEPBACKSLASH='\'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
-])
-
-# Generate code to set up dependency tracking. -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file 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.
-
-#serial 3
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # So let's grep whole file.
- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`AS_DIRNAME(["$file"])`
- AS_MKDIR_P([$dirpart/$fdir])
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
-done
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled. FIXME. This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file 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.
-
-# serial 8
-
-# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-
-# Do all the work for Automake. -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file 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.
-
-# serial 12
-
-# This macro actually does too much. Some checks are only needed if
-# your package does certain things. But this isn't really a big deal.
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out. PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition. After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.58])dnl
-dnl Autoconf wants to disallow AM_ names. We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
- test -f $srcdir/config.status; then
- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
- if (cygpath --version) >/dev/null 2>/dev/null; then
- CYGPATH_W='cygpath -w'
- else
- CYGPATH_W=echo
- fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
- [_AM_PROG_TAR([v7])])])
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
- [_AM_DEPENDENCIES(CC)],
- [define([AC_PROG_CC],
- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
- [_AM_DEPENDENCIES(CXX)],
- [define([AC_PROG_CXX],
- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-])
-])
-
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated. The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
- case $_am_header in
- $1 | $1:* )
- break ;;
- * )
- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
- esac
-done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file 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.
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
-AC_SUBST(install_sh)])
-
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
-#
-# This file 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.
-
-# serial 2
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot. For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
- am__leading_dot=.
-else
- am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# Check to see how 'make' treats includes. -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file 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.
-
-# serial 3
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
- @echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
- am__include=include
- am__quote=
- _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
- am__include=.include
- am__quote="\""
- _am_result=BSD
- fi
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
-# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file 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.
-
-# serial 4
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
- am_missing_run="$MISSING --run "
-else
- am_missing_run=
- AC_MSG_WARN([`missing' script is too old or missing])
-fi
-])
-
-# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
-#
-# This file 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.
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-#
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-# created by `make install' are always world readable, even if the
-# installer happens to have an overly restrictive umask (e.g. 077).
-# This was a mistake. There are at least two reasons why we must not
-# use `-m 0755':
-# - it causes special bits like SGID to be ignored,
-# - it may be too restrictive (some setups expect 775 directories).
-#
-# Do not use -m 0755 and let people choose whatever they expect by
-# setting umask.
-#
-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-# Some implementations (such as Solaris 8's) are not thread-safe: if a
-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-# concurrently, both version can detect that a/ is missing, but only
-# one can create it and the other will error out. Consequently we
-# restrict ourselves to GNU make (using the --version option ensures
-# this.)
-AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
- # We used to keeping the `.' as first argument, in order to
- # allow $(mkdir_p) to be used without argument. As in
- # $(mkdir_p) $(somedir)
- # where $(somedir) is conditionally defined. However this is wrong
- # for two reasons:
- # 1. if the package is installed by a user who cannot write `.'
- # make install will fail,
- # 2. the above comment should most certainly read
- # $(mkdir_p) $(DESTDIR)$(somedir)
- # so it does not work when $(somedir) is undefined and
- # $(DESTDIR) is not.
- # To support the latter case, we have to write
- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
- # so the `.' trick is pointless.
- mkdir_p='mkdir -p --'
-else
- # On NextStep and OpenStep, the `mkdir' command does not
- # recognize any option. It will interpret all options as
- # directories to create, and then abort because `.' already
- # exists.
- for d in ./-p ./--version;
- do
- test -d $d && rmdir $d
- done
- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
- if test -f "$ac_aux_dir/mkinstalldirs"; then
- mkdir_p='$(mkinstalldirs)'
- else
- mkdir_p='$(install_sh) -d'
- fi
-fi
-AC_SUBST([mkdir_p])])
-
-# Helper functions for option handling. -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file 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.
-
-# serial 3
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# ------------------------------
-# Set option NAME. Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-# Check to make sure that the build environment is sane. -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file 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.
-
-# serial 4
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments. Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
- if test "$[*]" = "X"; then
- # -L didn't work.
- set X `ls -t $srcdir/configure conftest.file`
- fi
- rm -f conftest.file
- if test "$[*]" != "X $srcdir/configure conftest.file" \
- && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
-alias in your environment])
- fi
-
- test "$[2]" = conftest.file
- )
-then
- # Ok.
- :
-else
- AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file 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.
-
-# AM_PROG_INSTALL_STRIP
-# ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries. This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'. However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
- AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-# Check how to create a tarball. -*- Autoconf -*-
-
-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
-#
-# This file 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.
-
-# serial 2
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
-#
-# Substitute a...
[truncated message content] |
|
From: <dio...@us...> - 2007-10-17 11:08:06
|
Revision: 165
http://pikloops.svn.sourceforge.net/pikloops/?rev=165&view=rev
Author: dionysos-sf
Date: 2007-10-17 04:08:06 -0700 (Wed, 17 Oct 2007)
Log Message:
-----------
New release
Modified Paths:
--------------
prog/trunk/ChangeLog
prog/trunk/ChangeLog.old
prog/trunk/pikloops.spec
Modified: prog/trunk/ChangeLog
===================================================================
--- prog/trunk/ChangeLog 2007-10-17 09:40:56 UTC (rev 164)
+++ prog/trunk/ChangeLog 2007-10-17 11:08:06 UTC (rev 165)
@@ -1,57 +1,101 @@
-2007-09-28 09:43 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
+2007-10-15 21:46 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
- * pikloops.spec: Update to 0.2.4
+ * po/es.po: Add trailing point, fix copyright.
-2007-09-28 09:22 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
+2007-10-15 21:36 Carlos M. Cámara <cmcamara+PIKLOOPS AT gmail DOT com>
- * doc/en/index.docbook, doc/fr/index.docbook: Update URL, revision
- date, release number
+ * po/es.po: Spanish translation up to date
-2007-09-28 08:50 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
+2007-10-15 17:24 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
- * authors.xml: Add spanish translator
+ * po/de.po, po/es.po, po/fr.po, po/pikloops.pot: Update strings.
-2007-09-28 08:38 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
+2007-10-15 17:24 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
- * src/pikloops.desktop: Desktop comment localisation
+ * src/mainwidgetpl.cpp, src/pikdelay.cpp, src/pikdelay.h: - Fix bug
+ in calculation
+ - Remove CounterD
+ - New delay management
+ - Update copyright
-2007-09-28 08:33 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
+2007-10-15 08:16 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
- * po/es.po: Fix spanish translator email
+ * src/pikloops.desktop: Remove Education category, add Engineering
+ category.
-2007-09-21 18:15 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
+2007-10-11 15:29 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
- * ChangeLog.old: Update for 0.2.4 release
+ * po/de.po, po/es.po, po/fr.po, po/pikloops.pot: Update strings
-2007-09-21 18:04 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
+2007-10-11 15:07 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
- * NEWS: A file to easily follow the main changes
+ * src/mainwidgetpl.cpp: Harmonious code
-2007-09-21 17:48 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
+2007-10-11 15:06 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
- * configure.in.in: Next release
+ * src/mainwidgetpl.cpp: Don't localize PIC instructions
-2007-09-21 17:47 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
+2007-10-11 14:57 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
- * src/main.cpp: Fix typo
+ * src/mainwidgetpl.cpp: Simplify string
-2007-09-21 06:41 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
+2007-10-11 14:56 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
- * po/es.po: Date format don't have to be translated
+ * src/mainwidgetpl.cpp: Remove useless white space in assembler
+ code line
-2007-09-20 15:09 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
+2007-10-11 14:53 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
- * po/de.po: Fix a typo that breaks PIC assembler syntax.
+ * src/mainwidgetpl.cpp: More cleanup
-2007-09-20 13:49 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
+2007-10-11 14:39 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
- * po/es.po: Updated spanish translation by Carlos M. Cámara Mora
+ * src/mainwidgetpl.cpp: Default frequency is 4MHz
-2007-08-22 11:03 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
+2007-10-11 14:37 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
- * pikloops.spec: Licence tag clarification.
+ * src/mainwidgetpl.cpp: Some cleanup
-2007-07-23 16:42 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
+2007-10-11 14:30 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
- * ChangeLog: ChangeLog for release 0.2.3
+ * src/pikdelay.cpp: Remove useless function call
+2007-10-09 17:50 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
+
+ * po/de.po, po/es.po, po/fr.po, po/pikloops.pot: Typo in generated
+ code
+
+2007-10-09 17:37 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
+
+ * src/mainwidgetpl.cpp: Typo in generated code
+
+2007-10-09 17:31 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
+
+ * src/pikdelay.cpp: Fix compile time error
+
+2007-10-09 17:22 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
+
+ * src/mainwidgetpl.cpp, src/pikdelay.cpp, src/pikdelay.h:
+ Mispelling
+
+2007-10-09 17:15 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
+
+ * src/pikdelay.cpp: Fix a gpasm warning
+
+2007-10-09 17:12 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
+
+ * src/pikdelay.cpp: Nicer look
+
+2007-10-08 13:24 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
+
+ * admin/ChangeLog, admin/Doxyfile.am, admin/acinclude.m4.in,
+ admin/am_edit, admin/config.guess, admin/config.sub,
+ admin/configure.in.bot.end, admin/cvs.sh,
+ admin/detect-autoconf.pl, admin/doxygen.sh, admin/install-sh,
+ admin/libtool.m4.in, admin/ltmain.sh, admin/missing: Update tools
+ for kdevelop svn
+
+2007-09-29 16:34 Carlos M. Cámara <cmcamara+PIKLOOPS AT gmail DOT com>
+
+ * po/es.po: Changed the date format in one string, just to test the
+ svn commit
Modified: prog/trunk/ChangeLog.old
===================================================================
--- prog/trunk/ChangeLog.old 2007-10-17 09:40:56 UTC (rev 164)
+++ prog/trunk/ChangeLog.old 2007-10-17 11:08:06 UTC (rev 165)
@@ -1,3 +1,64 @@
+2007-09-28 16:54 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
+
+ * ChangeLog: ChangeLog for release 0.2.4
+
+2007-09-28 09:43 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
+
+ * pikloops.spec: Update to 0.2.4
+
+2007-09-28 09:22 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
+
+ * doc/en/index.docbook, doc/fr/index.docbook: Update URL, revision
+ date, release number
+
+2007-09-28 08:50 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
+
+ * authors.xml: Add spanish translator
+
+2007-09-28 08:38 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
+
+ * src/pikloops.desktop: Desktop comment localisation
+
+2007-09-28 08:33 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
+
+ * po/es.po: Fix spanish translator email
+
+2007-09-21 18:15 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
+
+ * ChangeLog.old: Update for 0.2.4 release
+
+2007-09-21 18:04 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
+
+ * NEWS: A file to easily follow the main changes
+
+2007-09-21 17:48 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
+
+ * configure.in.in: Next release
+
+2007-09-21 17:47 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
+
+ * src/main.cpp: Fix typo
+
+2007-09-21 06:41 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
+
+ * po/es.po: Date format don't have to be translated
+
+2007-09-20 15:09 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
+
+ * po/de.po: Fix a typo that breaks PIC assembler syntax.
+
+2007-09-20 13:49 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
+
+ * po/es.po: Updated spanish translation by Carlos M. Cámara Mora
+
+2007-08-22 11:03 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
+
+ * pikloops.spec: Licence tag clarification.
+
+2007-07-23 16:42 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
+
+ * ChangeLog: ChangeLog for release 0.2.3
+
2007-07-23 13:03 Alain Portal <dionysos-sf AT users DOT sourceforge DOT net>
* ChangeLog.old: Don't let grow up the ChangeLog
@@ -286,4 +347,3 @@
src/pikloops.desktop, src/pikloops.h, src/pikloops22.png,
src/pikloops22.xpm, src/pikloopsui.rc, stamp-h.in, subdirs:
Initial import based on pikloops-0.2.1.tar.gz
-
Modified: prog/trunk/pikloops.spec
===================================================================
--- prog/trunk/pikloops.spec 2007-10-17 09:40:56 UTC (rev 164)
+++ prog/trunk/pikloops.spec 2007-10-17 11:08:06 UTC (rev 165)
@@ -1,5 +1,5 @@
Name: pikloops
-Version: 0.2.4
+Version: 0.2.5
Release: 1%{?dist}
Summary: Code generator for PIC delays
Summary(fr): Générateur de code de temporisation pour PIC
@@ -82,6 +82,9 @@
%{_datadir}/icons/crystalsvg/*/apps/%{name}.png
%changelog
+* Wed Oct 17 2007 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.2.5-1
+ - New upstream version
+
* Wed Sep 28 2007 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.2.4-1
- New upstream version
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-18 14:11:07
|
Revision: 178
http://pikloops.svn.sourceforge.net/pikloops/?rev=178&view=rev
Author: dionysos-sf
Date: 2007-10-18 07:11:09 -0700 (Thu, 18 Oct 2007)
Log Message:
-----------
New feature: time unit selector. Change number display format
Modified Paths:
--------------
prog/trunk/NEWS
prog/trunk/src/mainwidgetpl.cpp
prog/trunk/src/mainwidgetpl.h
prog/trunk/src/pikdelay.cpp
prog/trunk/src/pikdelay.h
Modified: prog/trunk/NEWS
===================================================================
--- prog/trunk/NEWS 2007-10-17 15:34:50 UTC (rev 177)
+++ prog/trunk/NEWS 2007-10-18 14:11:09 UTC (rev 178)
@@ -1,3 +1,7 @@
+Version 0.3.0 :
+ New feature: a time unit selector
+ Don't display trailing zeroes
+
Version 0.2.5 :
Fix bug in delay calculation
Modify delay calculation management
Modified: prog/trunk/src/mainwidgetpl.cpp
===================================================================
--- prog/trunk/src/mainwidgetpl.cpp 2007-10-17 15:34:50 UTC (rev 177)
+++ prog/trunk/src/mainwidgetpl.cpp 2007-10-18 14:11:09 UTC (rev 178)
@@ -43,8 +43,8 @@
: QVBox(parent, name)
{
QFont LabelFont;
- loopValues = new PiKDelay(4.00, 1.00);
- statusMessage = i18n("Actual delay: %1 s (%2 clock cycles).") ;
+ loopValues = new PiKDelay(4.00, 1.00, 0.001);
+ statusMessage = i18n("Actual delay: %1%2 (%3 clock cycles).") ;
setSpacing(3) ;
setMargin(6) ;
@@ -61,12 +61,21 @@
clock->setCurrentItem(2) ;
QToolTip::add(clock,i18n("Select a standard device clock, or type a custom clock frequency.")) ;
- (new QHBox(grinput))->setMinimumWidth(40) ;
+ (new QHBox(grinput))->setMinimumWidth(10) ;
new QLabel(i18n("Needed delay (s)"), grinput) ;
delay = new KRestrictedLine (grinput,"delay editor","0123456789.") ;
delay->setText("1");
delay->setMinimumWidth(60);
+ (new QHBox(grinput))->setMinimumWidth(10) ;
+ new QLabel(i18n("Unit"), grinput) ;
+ units = new QComboBox(grinput) ;
+ static const char* units_items[] = { "s", "ms", "us", 0};
+ units->insertStrList( units_items );
+ units->setEditable(false) ;
+ units->setCurrentItem(1) ;
+
+
// output
QVGroupBox *groutput = new QVGroupBox( i18n("Ouput data") , this) ;
CodeText = new GQTextEdit(groutput,"code displayer");
@@ -74,10 +83,12 @@
CodeText->setReadOnly(true);
cycles = new QLabel(statusMessage
- .arg(loopValues->getTimeDelay(),0,'f',8)
+ .arg(loopValues->getTimeDelay(),0,'g',-1)
+ .arg(units->currentText())
.arg((loopValues->getMachineCycles()),0,'f',0) , groutput ) ;
connect(clock, SIGNAL(activated(const QString &)), this, SLOT(ClockChanged(const QString &)));
+ connect(units, SIGNAL(activated(const QString &)), this, SLOT(UnitChanged(const QString &)));
connect(delay, SIGNAL(returnPressed()), this, SLOT(TimeDelayChanged()));
connect(delay, SIGNAL(lostFocus()), this, SLOT(TimeDelayChanged()));
@@ -100,11 +111,13 @@
// set label names
QString routineName = i18n("delay_") ;
routineName += delay->text() ;
- routineName += i18n("_sec") ;
+ routineName += "_" ;
+ routineName += units->currentText() ;
QString loopName = routineName + i18n("_loop") ;
QString subRoutineName = i18n("sub_delay_") ;
subRoutineName += delay->text() ;
- subRoutineName += i18n("_sec") ;
+ subRoutineName += "_" ;
+ subRoutineName += units->currentText() ;
QString loopSubRoutineName = subRoutineName + i18n("_loop") ;
// generate comments
@@ -114,8 +127,10 @@
tmpCode += QDateTime::currentDateTime().toString(i18n("ddd yyyy-MMM-dd hh:mm:ss")) ;
tmpCode += ")\n; " ;
- tmpCode += QString(i18n("Time Delay = %1s with Osc = %2MHz\n\n")).
- arg(loopValues->getTimeDelay(),0,'f',8).arg(loopValues->getClockFrequency(),0,'f',8);
+ tmpCode += QString(i18n("Time Delay = %1%2 with Osc = %3MHz\n\n"))
+ .arg(loopValues->getTimeDelay(),0,'g',-1)
+ .arg(units->currentText())
+ .arg(loopValues->getClockFrequency(),0,'g',-1);
tmpCode += routineName ;
tmpCode += "\n" ;
@@ -205,8 +220,9 @@
}
}
// update status line
- cycles->setText(statusMessage.arg(loopValues->getTimeDelay(),0,'f',8)
- .arg((loopValues->getMachineCycles()),0,'f',0) ) ;
+ cycles->setText(statusMessage.arg(loopValues->getTimeDelay(),0,'g',-1)
+ .arg(units->currentText())
+ .arg((loopValues->getMachineCycles()),0,'f',0) ) ;
CodeText->setText(tmpCode);
CodeText->setFocus();
@@ -246,6 +262,29 @@
refreshWidget();
}
+
+/*!
+ \fn MainWidgetPL::UnitChanged()
+ */
+void MainWidgetPL::UnitChanged(const QString& s)
+{
+ double tmp;
+
+ if ( s == "s" ) {
+ tmp = 1.0;
+ }
+ else if ( s == "us" ) {
+ tmp = 0.000001;
+ }
+ else {
+ tmp = 0.001;
+ }
+
+ loopValues->setTimeUnit(tmp) ;
+ loopValues->Refresh();
+ refreshWidget();
+}
+
#include "mainwidgetpl.moc"
Modified: prog/trunk/src/mainwidgetpl.h
===================================================================
--- prog/trunk/src/mainwidgetpl.h 2007-10-17 15:34:50 UTC (rev 177)
+++ prog/trunk/src/mainwidgetpl.h 2007-10-18 14:11:09 UTC (rev 178)
@@ -50,6 +50,7 @@
private:
PiKDelay *loopValues;
QComboBox *clock;
+ QComboBox *units;
QTextEdit *CodeText;
QLabel *cycles;
KRestrictedLine *delay;
@@ -61,6 +62,7 @@
protected slots:
void ClockChanged(const QString &);
+ void UnitChanged(const QString &);
void TimeDelayChanged();
public slots:
Modified: prog/trunk/src/pikdelay.cpp
===================================================================
--- prog/trunk/src/pikdelay.cpp 2007-10-17 15:34:50 UTC (rev 177)
+++ prog/trunk/src/pikdelay.cpp 2007-10-18 14:11:09 UTC (rev 178)
@@ -23,10 +23,11 @@
#include <math.h>
-PiKDelay::PiKDelay(double ClkF, double TmDly)
+PiKDelay::PiKDelay(double ClkF, double TmDly, double TmUnt)
{
setClockFrequency(ClkF);
setTimeDelay(TmDly);
+ setTimeUnit(TmUnt);
Refresh();
}
@@ -43,7 +44,7 @@
{
CounterA = CounterB = CounterC = -1;
Overflow = 0 ;
- MachineCycleTime = 4.0/(ClockFrequency*1000000.0);
+ MachineCycleTime = 4.0/(ClockFrequency*1000000.0*TimeUnit);
MachineCycles = floor(TimeDelay/MachineCycleTime);
if ( MachineCycles < MACHINE_CYCLE_MIN ) {
@@ -128,6 +129,20 @@
/*!
+ \fn PiKDelay::setTimeUnit(double = 0.001)
+ */
+void PiKDelay::setTimeUnit(double TU)
+{
+ if ( TU == 1.0 || TU == 0.000001 ) {
+ TimeUnit = TU;
+ }
+ else {
+ TimeUnit = 0.001;
+ }
+}
+
+
+/*!
\fn PiKDelay::getMachineCycles()
*/
double PiKDelay::getMachineCycles()
Modified: prog/trunk/src/pikdelay.h
===================================================================
--- prog/trunk/src/pikdelay.h 2007-10-17 15:34:50 UTC (rev 177)
+++ prog/trunk/src/pikdelay.h 2007-10-18 14:11:09 UTC (rev 178)
@@ -32,11 +32,12 @@
class PiKDelay{
public:
- PiKDelay(double = 4.00, double = 1.00);
+ PiKDelay(double = 4.00, double = 1.00, double = 0.001);
~PiKDelay();
void setClockFrequency(double);
void setTimeDelay(double);
+ void setTimeUnit(double);
double getMachineCycles();
double getTimeDelay();
double getClockFrequency();
@@ -50,6 +51,7 @@
private:
double ClockFrequency;
double TimeDelay;
+ double TimeUnit;
double MachineCycles;
double MachineCycleTime;
int CounterA;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-19 15:13:06
|
Revision: 184
http://pikloops.svn.sourceforge.net/pikloops/?rev=184&view=rev
Author: dionysos-sf
Date: 2007-10-19 08:13:07 -0700 (Fri, 19 Oct 2007)
Log Message:
-----------
New feature: delay, frequency and time unit can be add on the command line
Modified Paths:
--------------
prog/trunk/NEWS
prog/trunk/src/main.cpp
prog/trunk/src/mainwidgetpl.cpp
Added Paths:
-----------
prog/trunk/src/options.h
Modified: prog/trunk/NEWS
===================================================================
--- prog/trunk/NEWS 2007-10-18 15:08:33 UTC (rev 183)
+++ prog/trunk/NEWS 2007-10-19 15:13:07 UTC (rev 184)
@@ -1,5 +1,6 @@
Version 0.3.0 :
New feature: a time unit selector
+ New feature: delay, frequency and time unit can be add on the command line
Don't display trailing zeroes
Version 0.2.5 :
Modified: prog/trunk/src/main.cpp
===================================================================
--- prog/trunk/src/main.cpp 2007-10-18 15:08:33 UTC (rev 183)
+++ prog/trunk/src/main.cpp 2007-10-19 15:13:07 UTC (rev 184)
@@ -26,17 +26,33 @@
#include <kcmdlineargs.h>
#include <klocale.h>
+extern double optFrequency;
+extern double optDelay;
+extern double optUnit;
static const char description[] = I18N_NOOP("Pic Delay Calculator");
static const char version[] = VERSION;
static KCmdLineOptions options[] =
{
// { "+[URL]", I18N_NOOP( "Document to open." ), 0 },
+
+ { "f", 0, 0 },
+ { "frequency <frequency>", I18N_NOOP("Frequency of the PIC oscillator in MHz"), "4.0" },
+ { "d", 0, 0 },
+ { "delay <delay>", I18N_NOOP("Requested delay"), "1.0" },
+ { "u", 0, 0 },
+ { "time-unit <unit>", I18N_NOOP("Time unit of the delay\nValid units are \"s\", \"ms\" and \"us\""), "ms" },
KCmdLineLastOption
};
int main(int argc, char **argv)
{
+ QCString argFrequency;
+ QCString argDelay;
+ QCString argUnit;
+ bool parseOptionFailed=FALSE;
+ bool conversionIsOk;
+
KAboutData about("pikloops",
I18N_NOOP("PikLoops"),
version,
@@ -73,6 +89,40 @@
/// @todo do something with the command line args here
+ argFrequency = args->getOption("frequency");
+ argDelay = args->getOption("delay");
+ argUnit = args->getOption("time-unit");
+
+ if ( qstrcmp (argUnit, "s") == 0 ) {
+ optUnit = 1.0 ;
+ }
+ else if ( qstrcmp (argUnit, "ms") == 0 ) {
+ optUnit = 0.001 ;
+ }
+ else if ( qstrcmp (argUnit, "us") == 0 ) {
+ optUnit = 0.000001 ;
+ }
+ else {
+ QString msgError = QString(i18n("\"%1\" isn't a valid time unit.\n")).arg(argUnit);
+ msgError += i18n("Valid units are \"s\", \"ms\" and \"us\"");
+ qDebug(msgError);
+ parseOptionFailed=TRUE;
+ }
+
+ optFrequency = argFrequency.toDouble(&conversionIsOk);
+ if ( conversionIsOk == FALSE ) {
+ QString msgError = QString(i18n("\"%1\" isn't a valid frequency.\n")).arg(argFrequency);
+ qDebug(msgError);
+ parseOptionFailed=TRUE;
+ }
+
+ optDelay = argDelay.toDouble(&conversionIsOk);
+ if ( conversionIsOk == FALSE ) {
+ QString msgError = QString(i18n("\"%1\" isn't a valid delay.\n")).arg(argDelay);
+ qDebug(msgError);
+ parseOptionFailed=TRUE;
+ }
+
mainWin = new PiKLoops();
app.setMainWidget( mainWin );
@@ -82,7 +132,9 @@
args->clear();
}
+ if ( parseOptionFailed==FALSE ) {
// mainWin has WDestructiveClose flag by default, so it will delete itself.
- return app.exec();
+ return app.exec();
+ }
}
Modified: prog/trunk/src/mainwidgetpl.cpp
===================================================================
--- prog/trunk/src/mainwidgetpl.cpp 2007-10-18 15:08:33 UTC (rev 183)
+++ prog/trunk/src/mainwidgetpl.cpp 2007-10-19 15:13:07 UTC (rev 184)
@@ -20,6 +20,7 @@
* */
#include "mainwidgetpl.h"
+#include "options.h"
#include <qlayout.h>
#include <qlabel.h>
#include <qtextedit.h>
@@ -43,7 +44,7 @@
: QVBox(parent, name)
{
QFont LabelFont;
- loopValues = new PiKDelay(4.00, 1.00, 0.001);
+ loopValues = new PiKDelay(optFrequency, optDelay, optUnit);
statusMessage = i18n("Actual delay: %1%2 (%3 clock cycles).") ;
setSpacing(3) ;
@@ -58,13 +59,25 @@
"32.000000", "40.000000", 0};
clock->insertStrList( items );
clock->setEditable(true) ;
- clock->setCurrentItem(2) ;
+
+ for (int i=0; items[i]!=0; i++) {
+ if ( QString("%1").arg(*items[i],0,'g',-1).toDouble() == optFrequency ) {
+ clock->setCurrentItem(i) ;
+ }
+ }
+
+ if ( clock->currentText().toDouble() != optFrequency ) {
+ clock->insertItem(QString("%1").arg(optFrequency,0,'f',8),-1);
+ clock->setCurrentItem(10) ;
+ }
QToolTip::add(clock,i18n("Select a standard device clock, or type a custom clock frequency.")) ;
(new QHBox(grinput))->setMinimumWidth(10) ;
new QLabel(i18n("Needed delay (s)"), grinput) ;
delay = new KRestrictedLine (grinput,"delay editor","0123456789.") ;
- delay->setText("1");
+
+ delay->setText(QString("%1").arg(optDelay,0,'g',-1));
+
delay->setMinimumWidth(60);
(new QHBox(grinput))->setMinimumWidth(10) ;
@@ -73,8 +86,16 @@
static const char* units_items[] = { "s", "ms", "us", 0};
units->insertStrList( units_items );
units->setEditable(false) ;
- units->setCurrentItem(1) ;
+ if ( optUnit == 1.0 ) {
+ units->setCurrentItem(0) ;
+ }
+ else if ( optUnit == 0.000001 ) {
+ units->setCurrentItem(2) ;
+ }
+ else {
+ units->setCurrentItem(1) ;
+ }
// output
QVGroupBox *groutput = new QVGroupBox( i18n("Ouput data") , this) ;
Added: prog/trunk/src/options.h
===================================================================
--- prog/trunk/src/options.h (rev 0)
+++ prog/trunk/src/options.h 2007-10-19 15:13:07 UTC (rev 184)
@@ -0,0 +1,30 @@
+/**
+ * Copyright (C) 2007 - Alain Portal <aportal AT univ-montp2 DOT fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the
+ * Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * */
+
+#ifndef OPTIONS_H
+#define OPTIONS_H
+
+
+ double optFrequency;
+ double optDelay;
+ double optUnit;
+
+
+#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X