x11-apps: Changes to 'debian-unstable'
debian/changelog | 9
debian/patches/oclock-ftbfs.diff | 57
debian/patches/series | 1
oclock/ChangeLog | 97
oclock/Clock.c | 35
oclock/Clock.h | 2
oclock/ClockP.h | 4
oclock/Makefile.am | 23
oclock/Makefile.in | 288 +
oclock/aclocal.m4 | 1074 ++++-
oclock/app-defaults/Clock-color | 1
oclock/config.guess | 18
oclock/config.h.in | 3
oclock/config.sub | 76
oclock/configure | 5768 ++++++++++++++++++++++++++++++-
oclock/configure.ac | 28
oclock/man/Makefile.am | 12
oclock/man/Makefile.in | 415 ++
oclock/man/oclock.man | 102
oclock/oclock.c | 36
oclock/oclock.man | 104
oclock/transform.c | 6
oclock/transform.h | 14
x11perf/ChangeLog | 137
x11perf/Makefile.am | 45
x11perf/Makefile.in | 292 +
x11perf/Xmark.man | 66
x11perf/aclocal.m4 | 390 ++
x11perf/configure | 151
x11perf/configure.ac | 13
x11perf/do_blt.c | 58
x11perf/do_tests.c | 24
x11perf/man/Makefile.am | 12
x11perf/man/Makefile.in | 421 ++
x11perf/man/Xmark.man | 66
x11perf/man/x11perf.man | 1016 +++++
x11perf/man/x11perfcomp.man | 80
x11perf/x11pcomp.cpp | 103
x11perf/x11perf.h | 3
x11perf/x11perf.man | 1016 -----
x11perf/x11perfcomp.in | 108
x11perf/x11perfcomp.man | 80
xclipboard/ChangeLog | 78
xclipboard/Makefile.am | 21
xclipboard/Makefile.in | 282 +
xclipboard/aclocal.m4 | 972 ++++-
xclipboard/app-defaults/XClipboard | 17
xclipboard/configure | 5507 +++++++++++++++++++++++++++++-
xclipboard/configure.ac | 11
xclipboard/man/Makefile.am | 12
xclipboard/man/Makefile.in | 417 ++
xclipboard/man/xclipboard.man | 151
xclipboard/man/xcutsel.man | 106
xclipboard/xclipboard.c | 5
xclipboard/xclipboard.man | 151
xclipboard/xcutsel.c | 8
xclipboard/xcutsel.man | 106
xclock/ChangeLog | 124
xclock/Clock.c | 4
xclock/Makefile.am | 20
xclock/Makefile.in | 287 +
xclock/aclocal.m4 | 2492 +++++++++++--
xclock/config.h.in | 5
xclock/config.rpath | 666 +++
xclock/configure | 6790 +++++++++++++++++++++++++++++++++----
xclock/configure.ac | 23
xclock/man/Makefile.am | 12
xclock/man/Makefile.in | 423 ++
xclock/man/xclock.man | 273 +
xclock/xclock.man | 273 -
70 files changed, 27051 insertions(+), 4439 deletions(-)
New commits:
commit 9393f2bddaaa42b32cfea22ec1dab7a8bc1b021f
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Sat Feb 11 14:24:01 2012 -0500
Drop oclock-ftbfs.diff, upstream.
diff --git a/debian/changelog b/debian/changelog
index 2e3b4d2..f95799b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ x11-apps (7.6+6) UNRELEASED; urgency=low
* x11perf 1.5.4
* xclipboard 1.1.2
* xclock 1.0.6
+ * Drop oclock-ftbfs.diff, upstream.
- -- Robert Hooker <sarvatt@ubuntu.com> Sat, 11 Feb 2012 14:19:05 -0500
+ -- Robert Hooker <sarvatt@ubuntu.com> Sat, 11 Feb 2012 14:22:27 -0500
x11-apps (7.6+5) unstable; urgency=low
diff --git a/debian/patches/oclock-ftbfs.diff b/debian/patches/oclock-ftbfs.diff
deleted file mode 100644
index edc8b7d..0000000
--- a/debian/patches/oclock-ftbfs.diff
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/oclock/configure b/oclock/configure
-index e3f9cc5..9ad7c3a 100755
---- a/oclock/configure
-+++ b/oclock/configure
-@@ -4603,11 +4603,11 @@ if test -n "$OCLOCK_CFLAGS"; then
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xmu xext\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "x11 xmu xext") 2>&5
-+ ($PKG_CONFIG --exists --print-errors "x11 xmu xext xt") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-- pkg_cv_OCLOCK_CFLAGS=`$PKG_CONFIG --cflags "x11 xmu xext" 2>/dev/null`
-+ pkg_cv_OCLOCK_CFLAGS=`$PKG_CONFIG --cflags "x11 xmu xext xt" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-@@ -4619,11 +4619,11 @@ if test -n "$OCLOCK_LIBS"; then
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xmu xext\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "x11 xmu xext") 2>&5
-+ ($PKG_CONFIG --exists --print-errors "x11 xmu xext xt") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-- pkg_cv_OCLOCK_LIBS=`$PKG_CONFIG --libs "x11 xmu xext" 2>/dev/null`
-+ pkg_cv_OCLOCK_LIBS=`$PKG_CONFIG --libs "x11 xmu xext xt" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-@@ -4641,9 +4641,9 @@ else
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- OCLOCK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 xmu xext" 2>&1`
-+ OCLOCK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 xmu xext xt" 2>&1`
- else
-- OCLOCK_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 xmu xext" 2>&1`
-+ OCLOCK_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 xmu xext xt" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$OCLOCK_PKG_ERRORS" >&5
-diff --git a/oclock/configure.ac b/oclock/configure.ac
-index ab542a7..df176d8 100644
---- a/oclock/configure.ac
-+++ b/oclock/configure.ac
-@@ -38,7 +38,7 @@ XORG_DEFAULT_OPTIONS
- AM_CONFIG_HEADER(config.h)
-
- # Checks for pkg-config packages
--PKG_CHECK_MODULES(OCLOCK, x11 xmu xext)
-+PKG_CHECK_MODULES(OCLOCK, x11 xmu xext xt)
-
- PKG_CHECK_MODULES(APPDEFS, xt)
- xt_appdefaultdir=`$PKG_CONFIG --variable=appdefaultdir xt`
diff --git a/debian/patches/series b/debian/patches/series
index 0010293..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-oclock-ftbfs.diff
commit efe1c96257ab32eae903f9c090d61121a5113124
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Sat Feb 11 14:19:32 2012 -0500
xclock 1.0.6
diff --git a/debian/changelog b/debian/changelog
index 4f54e45..2e3b4d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ x11-apps (7.6+6) UNRELEASED; urgency=low
* oclock 1.0.3
* x11perf 1.5.4
* xclipboard 1.1.2
+ * xclock 1.0.6
- -- Robert Hooker <sarvatt@ubuntu.com> Sat, 11 Feb 2012 14:18:01 -0500
+ -- Robert Hooker <sarvatt@ubuntu.com> Sat, 11 Feb 2012 14:19:05 -0500
x11-apps (7.6+5) unstable; urgency=low
diff --git a/xclock/ChangeLog b/xclock/ChangeLog
index b207cf2..a8d4966 100644
--- a/xclock/ChangeLog
+++ b/xclock/ChangeLog
@@ -1,3 +1,127 @@
+commit cd184e2f1a6f8f4f9178d29e43dc08d1534504e3
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Feb 10 22:03:24 2012 -0800
+
+ xclock 1.0.6
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 251461d84de4220f05ffa35a3138aad1cd2e0302
+Author: Peter Stuge <peter@stuge.se>
+Date: Thu Aug 26 04:14:27 2010 +0200
+
+ Calculate text and window size from LC_CTYPE instead of LC_TIME
+
+ LC_TIME only defines what will be displayed, LC_CTYPE is what defines
+ the character encoding.
+
+ References:
+
+ Bug 15903 - LANG=en_US xclock -digital -font fixed has wrong size
+ https://bugs.freedesktop.org/show_bug.cgi?id=15903
+
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 45e936174e39637c09cd10c0a5c6f8752ee2d709
+Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+Date: Tue Aug 23 19:05:20 2011 -0500
+
+ Use AM_ICONV
+
+ AC_SEARCH_LIBS does not detect GNU libiconv because its symbols are
+ exported in the "libiconv" namespace instead of "iconv". The AM_ICONV
+ macro correctly detects both glibc and GNU libiconv, defines HAVE_ICONV,
+ ICONV_CONST, and LIBICONV depending on the system. The config.rpath
+ file is required by this macro.
+
+ This adds a dependency on the aclocal macros from gettext (gettext-devel
+ in some distros) when building from git, but not when building from a
+ tarball.
+
+ Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+ Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 27e10658010d314b40dfc9403a92864b26a9d576
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Jan 19 10:06:55 2011 -0500
+
+ config: move man pages into their own directory
+
+ Use services provided by XORG_MANPAGE_SECTIONS.
+ Use standard Makefile for man pages.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 5f26fbf5384ec03260edfa7d2bd8b39fde380d5b
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Jan 13 17:15:36 2011 -0500
+
+ man: replace hard coded man page section with substitution strings
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 64a5168667d30cfac2f6c6038a3b095b824580ac
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Jan 12 16:28:02 2011 -0500
+
+ config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+ This silences an Autoconf warning
+
+commit 0c5674fe5c12ae4258b23bf6d9cdbaac443162b7
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Jan 12 15:29:50 2011 -0500
+
+ config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
+
+ This silences an Automake warning.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 8e2adc61b09ca2a2959ed96091b2a49d306339fe
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Jan 12 15:12:08 2011 -0500
+
+ config: remove unrequired AC_SUBST([*_LIBS])
+
+ This macro is called by PKG_CHECK_MODULES
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 4995928a94c7cc2a295fbdf36d9949ae8f444cf6
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Jan 12 13:33:47 2011 -0500
+
+ config: remove unrequired AC_SUBST([*_CFLAGS])
+
+ This macro is called by PKG_CHECK_MODULES
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit b7b7a6c4b9227c7b429362c8ef232bf06cea57d1
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Jan 12 13:10:21 2011 -0500
+
+ config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
+
+ XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
+ AC_PROG_C_C99. This sets gcc with -std=gnu99.
+ If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit c37ee6e4b42776b6dd4147db6022c574e68288b7
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Jan 12 11:54:40 2011 -0500
+
+ config: use AC_PROG_INSTALL now supplied by XORG_DEFAULT_OPTIONS
+
+ It depends on util-macros 1.8 or later
+ The existing statement can now be removed from the configuration file.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
commit 97110e50013fc5735c6220f559588b0be9a8b821
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Sep 23 18:34:13 2010 -0700
diff --git a/xclock/Clock.c b/xclock/Clock.c
index 70eb0a1..ebbd2f6 100644
--- a/xclock/Clock.c
+++ b/xclock/Clock.c
@@ -591,7 +591,7 @@ Initialize (Widget request, Widget new, ArgList args, Cardinal *num_args)
w->clock.utf8 = False;
if (!no_locale) {
- char *time_locale = setlocale(LC_TIME, NULL);
+ char *time_locale = setlocale(LC_CTYPE, NULL);
if (strstr(time_locale, "UTF-8") || strstr(time_locale, "utf8")) {
w->clock.utf8 = True;
@@ -2214,7 +2214,7 @@ clock_to_utf8(const char *str, int in_len)
char *buf;
size_t buf_size;
size_t ileft, oleft;
- const char *inptr;
+ ICONV_CONST char *inptr;
char *outptr;
size_t ret;
const char *code_set = nl_langinfo(CODESET);
diff --git a/xclock/Makefile.am b/xclock/Makefile.am
index 0f43976..dcf4006 100644
--- a/xclock/Makefile.am
+++ b/xclock/Makefile.am
@@ -19,6 +19,7 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
+SUBDIRS = man
bin_PROGRAMS = xclock
AM_CFLAGS = $(CWARNFLAGS) $(XCLOCK_CFLAGS)
@@ -30,9 +31,6 @@ xclock_SOURCES = \
ClockP.h \
xclock.c
-appman_PRE = \
- xclock.man
-
# App default files (*.ad)
DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults
@@ -47,16 +45,8 @@ EXTRA_DIST = \
clmask.bit \
clock.bit
-MAINTAINERCLEANFILES = ChangeLog INSTALL
CLEANFILES = $(APPDEFAULTFILES)
-
-appmandir = $(APP_MAN_DIR)
-
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-
-EXTRA_DIST += $(appman_PRE)
-CLEANFILES += $(appman_DATA)
-
+MAINTAINERCLEANFILES = ChangeLog INSTALL
.PHONY: ChangeLog INSTALL
@@ -67,9 +57,3 @@ ChangeLog:
$(CHANGELOG_CMD)
dist-hook: ChangeLog INSTALL
-
-SUFFIXES = .$(APP_MAN_SUFFIX) .man
-
-# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
-.man.$(APP_MAN_SUFFIX):
- $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
diff --git a/xclock/Makefile.in b/xclock/Makefile.in
index 60a8f6f..8ed80e0 100644
--- a/xclock/Makefile.in
+++ b/xclock/Makefile.in
@@ -61,8 +61,8 @@ subdir = .
DIST_COMMON = README $(am__configure_deps) $(dist_appdefault_DATA) \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/config.h.in $(top_srcdir)/configure COPYING \
- ChangeLog INSTALL config.guess config.sub depcomp install-sh \
- missing
+ ChangeLog INSTALL config.guess config.rpath config.sub depcomp \
+ install-sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -73,8 +73,7 @@ mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)" \
- "$(DESTDIR)$(appdefaultdir)"
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appdefaultdir)"
PROGRAMS = $(bin_PROGRAMS)
am_xclock_OBJECTS = Clock.$(OBJEXT) xclock.$(OBJEXT)
xclock_OBJECTS = $(am_xclock_OBJECTS)
@@ -102,6 +101,13 @@ am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
am__v_GEN_0 = @echo " GEN " $@;
SOURCES = $(xclock_SOURCES)
DIST_SOURCES = $(xclock_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -123,9 +129,15 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-DATA = $(appman_DATA) $(dist_appdefault_DATA)
+DATA = $(dist_appdefault_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+ distdir dist dist-all distcheck
ETAGS = etags
CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -133,6 +145,31 @@ am__remove_distdir = \
{ test ! -d "$(distdir)" \
|| { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
&& rm -fr "$(distdir)"; }; }
+am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+ sed_rest='s,^[^/]*/*,,'; \
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+ sed_butlast='s,/*[^/]*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
@@ -150,6 +187,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BASE_CFLAGS = @BASE_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -177,10 +215,12 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
+LTLIBICONV = @LTLIBICONV@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -201,6 +241,7 @@ PKG_CONFIG = @PKG_CONFIG@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+STRICT_CFLAGS = @STRICT_CFLAGS@
STRIP = @STRIP@
VERSION = @VERSION@
XCLOCK_CFLAGS = @XCLOCK_CFLAGS@
@@ -261,6 +302,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+SUBDIRS = man
AM_CFLAGS = $(CWARNFLAGS) $(XCLOCK_CFLAGS)
xclock_LDADD = $(XCLOCK_LIBS)
xclock_SOURCES = \
@@ -269,9 +311,6 @@ xclock_SOURCES = \
ClockP.h \
xclock.c
-appman_PRE = \
- xclock.man
-
# App default files (*.ad)
DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults
@@ -279,17 +318,17 @@ dist_appdefault_DATA = \
app-defaults/XClock-color \
app-defaults/XClock
-EXTRA_DIST = clmask.bit clock.bit $(appman_PRE)
+EXTRA_DIST = \
+ clmask.bit \
+ clock.bit
+
+CLEANFILES = $(APPDEFAULTFILES)
MAINTAINERCLEANFILES = ChangeLog INSTALL
-CLEANFILES = $(APPDEFAULTFILES) $(appman_DATA)
-appmandir = $(APP_MAN_DIR)
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-SUFFIXES = .$(APP_MAN_SUFFIX) .man
all: config.h
- $(MAKE) $(AM_MAKEFLAGS) all-am
+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES:
-.SUFFIXES: .$(APP_MAN_SUFFIX) .man .c .o .obj
+.SUFFIXES: .c .o .obj
am--refresh:
@:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@@ -406,26 +445,6 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-install-appmanDATA: $(appman_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(appmandir)" || $(MKDIR_P) "$(DESTDIR)$(appmandir)"
- @list='$(appman_DATA)'; test -n "$(appmandir)" || list=; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(am__base_list) | \
- while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(appmandir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(appmandir)" || exit $$?; \
- done
-
-uninstall-appmanDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(appman_DATA)'; test -n "$(appmandir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(appmandir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(appmandir)" && rm -f $$files
install-dist_appdefaultDATA: $(dist_appdefault_DATA)
@$(NORMAL_INSTALL)
test -z "$(appdefaultdir)" || $(MKDIR_P) "$(DESTDIR)$(appdefaultdir)"
@@ -447,6 +466,76 @@ uninstall-dist_appdefaultDATA:
echo " ( cd '$(DESTDIR)$(appdefaultdir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(appdefaultdir)" && rm -f $$files
+# 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):
+ @fail= 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; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+ @fail= 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; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done && test -z "$$fail"
+tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__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 \
@@ -457,10 +546,23 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
mkid -fID $$unique
tags: TAGS
-TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
set x; \
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 || \
+ set "$$@" "$$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; \
@@ -479,7 +581,7 @@ TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
fi; \
fi
ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -531,6 +633,34 @@ distdir: $(DISTFILES)
|| 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; \
+ fi; \
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+ dir1=$$subdir; dir2="$(top_distdir)"; \
+ $(am__relativize); \
+ new_top_distdir=$$reldir; \
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+ ($(am__cd) $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$new_top_distdir" \
+ distdir="$$new_distdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
+ am__skip_mode_fix=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+ done
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$(top_distdir)" distdir="$(distdir)" \
dist-hook
@@ -650,21 +780,22 @@ distcleancheck: distclean
$(distcleancheck_listfiles) ; \
exit 1; } >&2
check-am: all-am
-check: check-am
+check: check-recursive
all-am: Makefile $(PROGRAMS) $(DATA) config.h
-installdirs:
- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)" "$(DESTDIR)$(appdefaultdir)"; do \
+installdirs: installdirs-recursive
+installdirs-am:
+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appdefaultdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-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-am
+installcheck: installcheck-recursive
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
@@ -683,98 +814,98 @@ 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-am
+clean: clean-recursive
clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
-distclean: distclean-am
+distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-hdr distclean-tags
-dvi: dvi-am
+dvi: dvi-recursive
dvi-am:
-html: html-am
+html: html-recursive
html-am:
-info: info-am
+info: info-recursive
info-am:
-install-data-am: install-appmanDATA install-dist_appdefaultDATA
+install-data-am: install-dist_appdefaultDATA
-install-dvi: install-dvi-am
+install-dvi: install-dvi-recursive
install-dvi-am:
install-exec-am: install-binPROGRAMS
-install-html: install-html-am
+install-html: install-html-recursive
install-html-am:
-install-info: install-info-am
+install-info: install-info-recursive
install-info-am:
install-man:
-install-pdf: install-pdf-am
+install-pdf: install-pdf-recursive
install-pdf-am:
-install-ps: install-ps-am
+install-ps: install-ps-recursive
install-ps-am:
installcheck-am:
-maintainer-clean: maintainer-clean-am
+maintainer-clean: maintainer-clean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf $(top_srcdir)/autom4te.cache
-rm -rf ./$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
-mostlyclean: mostlyclean-am
+mostlyclean: mostlyclean-recursive
mostlyclean-am: mostlyclean-compile mostlyclean-generic
-pdf: pdf-am
+pdf: pdf-recursive
pdf-am:
-ps: ps-am
+ps: ps-recursive
ps-am:
-uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
- uninstall-dist_appdefaultDATA
+uninstall-am: uninstall-binPROGRAMS uninstall-dist_appdefaultDATA
-.MAKE: all install-am install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
+ ctags-recursive install-am install-strip tags-recursive
-.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
- clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am am--refresh check check-am clean clean-binPROGRAMS \
+ clean-generic ctags ctags-recursive dist dist-all dist-bzip2 \
dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-xz \
dist-zip distcheck distclean distclean-compile \
distclean-generic distclean-hdr distclean-tags distcleancheck \
distdir distuninstallcheck dvi dvi-am html html-am info \
- info-am install install-am install-appmanDATA \
- install-binPROGRAMS install-data install-data-am \
- install-dist_appdefaultDATA install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
- uninstall-am uninstall-appmanDATA uninstall-binPROGRAMS \
- uninstall-dist_appdefaultDATA
+ info-am install install-am install-binPROGRAMS install-data \
+ install-data-am install-dist_appdefaultDATA install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ installdirs-am maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
+ ps ps-am tags tags-recursive uninstall uninstall-am \
+ uninstall-binPROGRAMS uninstall-dist_appdefaultDATA
.PHONY: ChangeLog INSTALL
@@ -787,10 +918,6 @@ ChangeLog:
dist-hook: ChangeLog INSTALL
-# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
-.man.$(APP_MAN_SUFFIX):
- $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/xclock/aclocal.m4 b/xclock/aclocal.m4
index dd551e5..6546e0e 100644
--- a/xclock/aclocal.m4
+++ b/xclock/aclocal.m4
@@ -406,18 +406,6 @@ AC_DEFUN([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,
@@ -1028,213 +1016,1413 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
-dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure.
-dnl
-dnl Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
-dnl
-dnl Permission is hereby granted, free of charge, to any person obtaining a
-dnl copy of this software and associated documentation files (the "Software"),
-dnl to deal in the Software without restriction, including without limitation
-dnl the rights to use, copy, modify, merge, publish, distribute, sublicense,
-dnl and/or sell copies of the Software, and to permit persons to whom the
-dnl Software is furnished to do so, subject to the following conditions:
-dnl
-dnl The above copyright notice and this permission notice (including the next
-dnl paragraph) shall be included in all copies or substantial portions of the
-dnl Software.
-dnl
-dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-dnl IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-dnl FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-dnl THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-dnl LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-dnl FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-dnl DEALINGS IN THE SOFTWARE.
-
-# XORG_MACROS_VERSION(required-version)
-# -------------------------------------
-# Minimum version: 1.1.0
-#
-# If you're using a macro added in Version 1.1 or newer, include this in
-# your configure.ac with the minimum required version, such as:
-# XORG_MACROS_VERSION(1.1)
-#
-# To ensure that this macro is defined, also add:
-# m4_ifndef([XORG_MACROS_VERSION],
-# [m4_fatal([must install xorg-macros 1.1 or later before running autoconf/autogen])])
-#
-#
-# See the "minimum version" comment for each macro you use to see what
-# version you require.
-m4_defun([XORG_MACROS_VERSION],[
-m4_define([vers_have], [1.10.0])
-m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
-m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
-m4_if(m4_cmp(maj_have, maj_needed), 0,,
- [m4_fatal([xorg-macros major version ]maj_needed[ is required but ]vers_have[ found])])
-m4_if(m4_version_compare(vers_have, [$1]), -1,
- [m4_fatal([xorg-macros version $1 or higher is required but ]vers_have[ found])])
-m4_undefine([vers_have])
-m4_undefine([maj_have])
-m4_undefine([maj_needed])
-]) # XORG_MACROS_VERSION
-
-# XORG_PROG_RAWCPP()
-# ------------------
-# Minimum version: 1.0.0
-#
-# Find cpp program and necessary flags for use in pre-processing text files
-# such as man pages and config files
-AC_DEFUN([XORG_PROG_RAWCPP],[
-AC_REQUIRE([AC_PROG_CPP])
-AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}],
- [$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib])
+# iconv.m4 serial AM4 (gettext-0.11.3)
+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
-# Check for flag to avoid builtin definitions - assumes unix is predefined,
-# which is not the best choice for supporting other OS'es, but covers most
-# of the ones we need for now.
-AC_MSG_CHECKING([if $RAWCPP requires -undef])
-AC_LANG_CONFTEST([Does cpp redefine unix ?])
-if test `${RAWCPP} < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
- AC_MSG_RESULT([no])
-else
- if test `${RAWCPP} -undef < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
- RAWCPPFLAGS=-undef
- AC_MSG_RESULT([yes])
- # under Cygwin unix is still defined even with -undef
Reply to: