Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 91176 Details for
Bug 139594
media-gfx/feh-1.3.4 should respect USE=xinerama
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch to feh's configure.ac to add --disable-xinerama option +regen
optional-xinerama.patch (text/plain), 24.84 KB, created by
Viktor Griph
on 2006-07-07 17:24:32 UTC
(
hide
)
Description:
patch to feh's configure.ac to add --disable-xinerama option +regen
Filename:
MIME Type:
Creator:
Viktor Griph
Created:
2006-07-07 17:24:32 UTC
Size:
24.84 KB
patch
obsolete
>diff -ur feh-1.3.4.original/aclocal.m4 feh-1.3.4.edited/aclocal.m4 >--- feh-1.3.4.original/aclocal.m4 2006-07-08 01:58:47.000000000 +0200 >+++ feh-1.3.4.edited/aclocal.m4 2006-07-08 02:06:55.461569362 +0200 >@@ -1,4 +1,4 @@ >-dnl aclocal.m4 generated automatically by aclocal 1.4-p6 >+dnl aclocal.m4t generated automatically by aclocal 1.4-p6 > > dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. > dnl This file is free software; the Free Software Foundation >@@ -153,7 +153,7 @@ > dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) > dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS > dnl >-AC_DEFUN(AM_PATH_GTK, >+AC_DEFUN([AM_PATH_GTK], > [dnl > dnl Get the cflags and libraries from the gtk-config script > dnl >Endast i feh-1.3.4.edited/: aclocal.m4~ >Endast i feh-1.3.4.edited/: autom4te.cache >diff -ur feh-1.3.4.original/cam/Makefile.in feh-1.3.4.edited/cam/Makefile.in >--- feh-1.3.4.original/cam/Makefile.in 2006-07-08 01:58:47.000000000 +0200 >+++ feh-1.3.4.edited/cam/Makefile.in 2006-07-08 02:06:56.585343257 +0200 >@@ -102,9 +102,9 @@ > all: all-redirect > .SUFFIXES: > $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) >- cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps cam/Makefile >+ cd $(top_srcdir) && $(AUTOMAKE) --foreign cam/Makefile > >-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status >+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) > cd $(top_builddir) \ > && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status > >@@ -136,6 +136,11 @@ > subdir = cam > > distdir: $(DISTFILES) >+ here=`cd $(top_builddir) && pwd`; \ >+ top_distdir=`cd $(top_distdir) && pwd`; \ >+ distdir=`cd $(distdir) && pwd`; \ >+ cd $(top_srcdir) \ >+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign cam/Makefile > @for file in $(DISTFILES); do \ > d=$(srcdir); \ > if test -d $$d/$$file; then \ >diff -ur feh-1.3.4.original/configure feh-1.3.4.edited/configure >--- feh-1.3.4.original/configure 2006-07-08 01:58:47.000000000 +0200 >+++ feh-1.3.4.edited/configure 2006-07-08 02:06:56.269406824 +0200 >@@ -682,13 +682,13 @@ > /^X\(\/\).*/{ s//\1/; q; } > s/.*/./; q'` > srcdir=$ac_confdir >- if test ! -r $srcdir/$ac_unique_file; then >+ if test ! -r "$srcdir/$ac_unique_file"; then > srcdir=.. > fi > else > ac_srcdir_defaulted=no > fi >-if test ! -r $srcdir/$ac_unique_file; then >+if test ! -r "$srcdir/$ac_unique_file"; then > if test "$ac_srcdir_defaulted" = yes; then > { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 > { (exit 1); exit 1; }; } >@@ -697,7 +697,7 @@ > { (exit 1); exit 1; }; } > fi > fi >-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || >+(cd $srcdir && test -r "./$ac_unique_file") 2>/dev/null || > { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 > { (exit 1); exit 1; }; } > srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` >@@ -806,6 +806,7 @@ > --enable-FEATURE[=ARG] include FEATURE [ARG=yes] > --enable-maintainer-mode enable make rules and dependencies not useful > (and sometimes confusing) to the casual installer >+ --disable-xinerama disable Xinerama multi screen support > > Optional Packages: > --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] >@@ -917,7 +918,7 @@ > else > echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 > fi >- cd "$ac_popdir" >+ cd $ac_popdir > done > fi > >@@ -2130,7 +2131,8 @@ > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 > (exit $ac_status); } && >- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' >+ { ac_try='test -z "$ac_c_werror_flag" >+ || test ! -s conftest.err' > { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 > (eval $ac_try) 2>&5 > ac_status=$? >@@ -2188,7 +2190,8 @@ > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 > (exit $ac_status); } && >- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' >+ { ac_try='test -z "$ac_c_werror_flag" >+ || test ! -s conftest.err' > { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 > (eval $ac_try) 2>&5 > ac_status=$? >@@ -2304,7 +2307,8 @@ > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 > (exit $ac_status); } && >- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' >+ { ac_try='test -z "$ac_c_werror_flag" >+ || test ! -s conftest.err' > { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 > (eval $ac_try) 2>&5 > ac_status=$? >@@ -2358,7 +2362,8 @@ > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 > (exit $ac_status); } && >- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' >+ { ac_try='test -z "$ac_c_werror_flag" >+ || test ! -s conftest.err' > { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 > (eval $ac_try) 2>&5 > ac_status=$? >@@ -2403,7 +2408,8 @@ > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 > (exit $ac_status); } && >- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' >+ { ac_try='test -z "$ac_c_werror_flag" >+ || test ! -s conftest.err' > { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 > (eval $ac_try) 2>&5 > ac_status=$? >@@ -2447,7 +2453,8 @@ > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 > (exit $ac_status); } && >- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' >+ { ac_try='test -z "$ac_c_werror_flag" >+ || test ! -s conftest.err' > { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 > (eval $ac_try) 2>&5 > ac_status=$? >@@ -2560,7 +2567,8 @@ > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 > (exit $ac_status); } && >- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' >+ { ac_try='test -z "$ac_c_werror_flag" >+ || test ! -s conftest.err' > { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 > (eval $ac_try) 2>&5 > ac_status=$? >@@ -2671,7 +2679,8 @@ > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 > (exit $ac_status); } && >- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' >+ { ac_try='test -z "$ac_c_werror_flag" >+ || test ! -s conftest.err' > { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 > (eval $ac_try) 2>&5 > ac_status=$? >@@ -3190,8 +3199,21 @@ > > > >-CFLAGS="-I/usr/X11R6/include $CFLAGS" >-LIBS="-L/usr/X11R6/lib $LIBS -lm -ljpeg" >+# Check whether --enable-xinerama or --disable-xinerama was given. >+if test "${enable_xinerama+set}" = set; then >+ enableval="$enable_xinerama" >+ if test x"$enableval" = xyes; then >+ with_xinerama="yes, check" >+ else >+ with_xinerama="no" >+ fi >+else >+ with_xinerama="not specified, check" >+ >+fi; >+if test x"$with_xinerama" != xno; then >+ CFLAGS="-I/usr/X11R6/include $CFLAGS" >+ LIBS="-L/usr/X11R6/lib $LIBS -lm -ljpeg" > > echo "$as_me:$LINENO: checking for XMissingExtension in -lXext" >&5 > echo $ECHO_N "checking for XMissingExtension in -lXext... $ECHO_C" >&6 >@@ -3231,7 +3253,8 @@ > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 > (exit $ac_status); } && >- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' >+ { ac_try='test -z "$ac_c_werror_flag" >+ || test ! -s conftest.err' > { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 > (eval $ac_try) 2>&5 > ac_status=$? >@@ -3306,7 +3329,8 @@ > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 > (exit $ac_status); } && >- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' >+ { ac_try='test -z "$ac_c_werror_flag" >+ || test ! -s conftest.err' > { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 > (eval $ac_try) 2>&5 > ac_status=$? >@@ -3344,6 +3368,7 @@ > > > >+fi > > echo "$as_me:$LINENO: checking for jpeg_destroy_decompress in -ljpeg" >&5 > echo $ECHO_N "checking for jpeg_destroy_decompress in -ljpeg... $ECHO_C" >&6 >@@ -3383,7 +3408,8 @@ > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 > (exit $ac_status); } && >- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' >+ { ac_try='test -z "$ac_c_werror_flag" >+ || test ! -s conftest.err' > { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 > (eval $ac_try) 2>&5 > ac_status=$? >@@ -3418,7 +3444,6 @@ > fi > > >- > echo "checking for pr0n.... found" > > ac_config_files="$ac_config_files Makefile feh.spec cam/Makefile src/Makefile src/ttfonts/Makefile" >@@ -4249,6 +4274,11 @@ > *) ac_INSTALL=$ac_top_builddir$INSTALL ;; > esac > >+ if test x"$ac_file" != x-; then >+ { echo "$as_me:$LINENO: creating $ac_file" >&5 >+echo "$as_me: creating $ac_file" >&6;} >+ rm -f "$ac_file" >+ fi > # Let's still pretend it is `configure' which instantiates (i.e., don't > # use $as_me), people would be surprised to read: > # /* config.h. Generated by config.status. */ >@@ -4287,12 +4317,6 @@ > fi;; > esac > done` || { (exit 1); exit 1; } >- >- if test x"$ac_file" != x-; then >- { echo "$as_me:$LINENO: creating $ac_file" >&5 >-echo "$as_me: creating $ac_file" >&6;} >- rm -f "$ac_file" >- fi > _ACEOF > cat >>$CONFIG_STATUS <<_ACEOF > sed "$ac_vpsub >diff -ur feh-1.3.4.original/configure.ac feh-1.3.4.edited/configure.ac >--- feh-1.3.4.original/configure.ac 2006-07-08 01:58:47.000000000 +0200 >+++ feh-1.3.4.edited/configure.ac 2006-07-08 02:06:45.156642860 +0200 >@@ -41,14 +41,24 @@ > AC_SUBST(GIBLIB_CFLAGS) > > dnl Check for Xinerama >-CFLAGS="-I/usr/X11R6/include $CFLAGS" >-LIBS="-L/usr/X11R6/lib $LIBS -lm -ljpeg" >-AC_CHECK_LIB(Xext,XMissingExtension,, [CFLAGS="$CFLAGS -I/usr/X11R6/include"]) >-AC_CHECK_LIB(Xinerama,XineramaQueryScreens,, [CFLAGS="$CFLAGS -I/usr/X11R6/include"]) >-AC_SUBST(HAVE_XINERAMA) >-AC_SUBST(XINERAMA_LIBS) >+AC_ARG_ENABLE(xinerama, >+ [ --disable-xinerama disable Xinerama multi screen support], >+ [ if test x"$enableval" = xyes; then >+ with_xinerama="yes, check" >+ else >+ with_xinerama="no" >+ fi ], >+ [ with_xinerama="not specified, check" ] >+) >+if test x"$with_xinerama" != xno; then >+ CFLAGS="-I/usr/X11R6/include $CFLAGS" >+ LIBS="-L/usr/X11R6/lib $LIBS -lm -ljpeg" >+ AC_CHECK_LIB(Xext,XMissingExtension,, [CFLAGS="$CFLAGS -I/usr/X11R6/include"]) >+ AC_CHECK_LIB(Xinerama,XineramaQueryScreens,, [CFLAGS="$CFLAGS -I/usr/X11R6/include"]) >+ AC_SUBST(HAVE_XINERAMA) >+ AC_SUBST(XINERAMA_LIBS) >+fi > AC_CHECK_LIB(jpeg, jpeg_destroy_decompress) >- > dnl AC_CHECK_FUNC(getopt_long,,[AC_LIBOBJ="$AC_LIBOBJ getopt.o getopt1.o"]) > dnl AC_SUBST(AC_LIBOBJ) > >diff -ur feh-1.3.4.original/Makefile.in feh-1.3.4.edited/Makefile.in >--- feh-1.3.4.original/Makefile.in 2006-07-08 01:58:47.000000000 +0200 >+++ feh-1.3.4.edited/Makefile.in 2006-07-08 02:06:56.574345470 +0200 >@@ -108,8 +108,7 @@ > > DIST_COMMON = README AUTHORS COPYING ChangeLog Makefile.am Makefile.in \ > TODO acinclude.m4 aclocal.m4 config.guess config.sub configure \ >-configure.ac configure.in feh.spec.in install-sh missing mkinstalldirs \ >-src/config.h.in src/stamp-h.in >+configure.ac configure.in feh.spec.in install-sh missing mkinstalldirs > > > DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) >@@ -119,9 +118,9 @@ > all: all-redirect > .SUFFIXES: > $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) >- cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps Makefile >+ cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile > >-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status >+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) > cd $(top_builddir) \ > && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status > >@@ -132,34 +131,6 @@ > $(SHELL) ./config.status --recheck > $(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) > cd $(srcdir) && $(AUTOCONF) >- >-src/config.h: src/stamp-h >- @if test ! -f $@; then \ >- rm -f src/stamp-h; \ >- $(MAKE) src/stamp-h; \ >- else :; fi >-src/stamp-h: $(srcdir)/src/config.h.in $(top_builddir)/config.status >- cd $(top_builddir) \ >- && CONFIG_FILES= CONFIG_HEADERS=src/config.h \ >- $(SHELL) ./config.status >- @echo timestamp > src/stamp-h 2> /dev/null >-$(srcdir)/src/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/src/stamp-h.in >- @if test ! -f $@; then \ >- rm -f $(srcdir)/src/stamp-h.in; \ >- $(MAKE) $(srcdir)/src/stamp-h.in; \ >- else :; fi >-$(srcdir)/src/stamp-h.in: $(top_srcdir)/configure.ac $(ACLOCAL_M4) >- cd $(top_srcdir) && $(AUTOHEADER) >- @echo timestamp > $(srcdir)/src/stamp-h.in 2> /dev/null >- >-mostlyclean-hdr: >- >-clean-hdr: >- >-distclean-hdr: >- -rm -f src/config.h >- >-maintainer-clean-hdr: > feh.spec: $(top_builddir)/config.status feh.spec.in > cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status > >@@ -233,7 +204,7 @@ > all-recursive install-data-recursive install-exec-recursive \ > installdirs-recursive install-recursive uninstall-recursive \ > check-recursive installcheck-recursive info-recursive dvi-recursive: >- @set fnord $(MAKEFLAGS); amf=$$2; \ >+ @set fnord $$MAKEFLAGS; amf=$$2; \ > dot_seen=no; \ > target=`echo $@ | sed s/-recursive//`; \ > list='$(SUBDIRS)'; for subdir in $$list; do \ >@@ -253,7 +224,7 @@ > > mostlyclean-recursive clean-recursive distclean-recursive \ > maintainer-clean-recursive: >- @set fnord $(MAKEFLAGS); amf=$$2; \ >+ @set fnord $$MAKEFLAGS; amf=$$2; \ > dot_seen=no; \ > rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ > rev="$$subdir $$rev"; \ >@@ -299,7 +270,7 @@ > awk ' { files[$$0] = 1; } \ > END { for (i in files) print i; }'`; \ > test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ >- || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) >+ || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) > > mostlyclean-tags: > >@@ -348,6 +319,11 @@ > -rm -rf $(distdir) > mkdir $(distdir) > -chmod 777 $(distdir) >+ here=`cd $(top_builddir) && pwd`; \ >+ top_distdir=`cd $(distdir) && pwd`; \ >+ distdir=`cd $(distdir) && pwd`; \ >+ cd $(top_srcdir) \ >+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign Makefile > @for file in $(DISTFILES); do \ > d=$(srcdir); \ > if test -d $$d/$$file; then \ >@@ -406,29 +382,28 @@ > > maintainer-clean-generic: > -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) >-mostlyclean-am: mostlyclean-hdr mostlyclean-tags mostlyclean-generic >+mostlyclean-am: mostlyclean-tags mostlyclean-generic > > mostlyclean: mostlyclean-recursive > >-clean-am: clean-hdr clean-tags clean-generic mostlyclean-am >+clean-am: clean-tags clean-generic mostlyclean-am > > clean: clean-recursive > >-distclean-am: distclean-hdr distclean-tags distclean-generic clean-am >+distclean-am: distclean-tags distclean-generic clean-am > > distclean: distclean-recursive > -rm -f config.status > >-maintainer-clean-am: maintainer-clean-hdr maintainer-clean-tags \ >- maintainer-clean-generic distclean-am >+maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ >+ distclean-am > @echo "This command is intended for maintainers to use;" > @echo "it deletes files that may require special tools to rebuild." > > maintainer-clean: maintainer-clean-recursive > -rm -f config.status > >-.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ >-install-man1 uninstall-man1 install-man uninstall-man \ >+.PHONY: install-man1 uninstall-man1 install-man uninstall-man \ > uninstall-docsDATA install-docsDATA install-data-recursive \ > uninstall-data-recursive install-exec-recursive \ > uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ >diff -ur feh-1.3.4.original/src/Makefile.in feh-1.3.4.edited/src/Makefile.in >--- feh-1.3.4.original/src/Makefile.in 2006-07-08 01:58:47.000000000 +0200 >+++ feh-1.3.4.edited/src/Makefile.in 2006-07-08 02:06:56.616337021 +0200 >@@ -128,6 +128,12 @@ > > TAR = tar > GZIP_ENV = --best >+DEP_FILES = .deps/collage.P .deps/events.P .deps/feh_png.P \ >+.deps/filelist.P .deps/getopt.P .deps/getopt1.P .deps/imlib.P \ >+.deps/index.P .deps/ipc.P .deps/keyevents.P .deps/list.P .deps/main.P \ >+.deps/md5.P .deps/menu.P .deps/multiwindow.P .deps/options.P \ >+.deps/slideshow.P .deps/support.P .deps/thumbnail.P .deps/timers.P \ >+.deps/transupp.P .deps/utils.P .deps/winwidget.P > SOURCES = $(feh_SOURCES) > OBJECTS = $(feh_OBJECTS) > >@@ -135,9 +141,9 @@ > .SUFFIXES: > .SUFFIXES: .S .c .o .s > $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) >- cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps src/Makefile >+ cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile > >-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status >+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) > cd $(top_builddir) \ > && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status > >@@ -195,9 +201,6 @@ > rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ > done > >-.c.o: >- $(COMPILE) -c $< >- > .s.o: > $(COMPILE) -c $< > >@@ -249,7 +252,7 @@ > all-recursive install-data-recursive install-exec-recursive \ > installdirs-recursive install-recursive uninstall-recursive \ > check-recursive installcheck-recursive info-recursive dvi-recursive: >- @set fnord $(MAKEFLAGS); amf=$$2; \ >+ @set fnord $$MAKEFLAGS; amf=$$2; \ > dot_seen=no; \ > target=`echo $@ | sed s/-recursive//`; \ > list='$(SUBDIRS)'; for subdir in $$list; do \ >@@ -269,7 +272,7 @@ > > mostlyclean-recursive clean-recursive distclean-recursive \ > maintainer-clean-recursive: >- @set fnord $(MAKEFLAGS); amf=$$2; \ >+ @set fnord $$MAKEFLAGS; amf=$$2; \ > dot_seen=no; \ > rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ > rev="$$subdir $$rev"; \ >@@ -315,7 +318,7 @@ > awk ' { files[$$0] = 1; } \ > END { for (i in files) print i; }'`; \ > test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \ >- || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP)) >+ || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS) > > mostlyclean-tags: > >@@ -331,6 +334,11 @@ > subdir = src > > distdir: $(DISTFILES) >+ here=`cd $(top_builddir) && pwd`; \ >+ top_distdir=`cd $(top_distdir) && pwd`; \ >+ distdir=`cd $(distdir) && pwd`; \ >+ cd $(top_srcdir) \ >+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/Makefile > @for file in $(DISTFILES); do \ > d=$(srcdir); \ > if test -d $$d/$$file; then \ >@@ -351,52 +359,38 @@ > || exit 1; \ > fi; \ > done >-collage.o: collage.c feh.h config.h getopt.h structs.h menu.h ipc.h \ >- utils.h debug.h winwidget.h filelist.h options.h >-events.o: events.c feh.h config.h getopt.h structs.h menu.h ipc.h \ >- utils.h debug.h filelist.h winwidget.h timers.h options.h \ >- events.h thumbnail.h >-feh_png.o: feh_png.c feh_png.h feh.h config.h getopt.h structs.h menu.h \ >- ipc.h utils.h debug.h >-filelist.o: filelist.c feh.h config.h getopt.h structs.h menu.h ipc.h \ >- utils.h debug.h filelist.h options.h >-getopt.o: getopt.c config.h >-getopt1.o: getopt1.c config.h getopt.h >-imlib.o: imlib.c feh.h config.h getopt.h structs.h menu.h ipc.h utils.h \ >- debug.h filelist.h winwidget.h options.h transupp.h >-index.o: index.c feh.h config.h getopt.h structs.h menu.h ipc.h utils.h \ >- debug.h filelist.h winwidget.h options.h >-ipc.o: ipc.c feh.h config.h getopt.h structs.h menu.h ipc.h utils.h \ >- debug.h options.h >-keyevents.o: keyevents.c feh.h config.h getopt.h structs.h menu.h ipc.h \ >- utils.h debug.h thumbnail.h filelist.h winwidget.h options.h >-list.o: list.c feh.h config.h getopt.h structs.h menu.h ipc.h utils.h \ >- debug.h filelist.h options.h >-main.o: main.c feh.h config.h getopt.h structs.h menu.h ipc.h utils.h \ >- debug.h filelist.h winwidget.h timers.h options.h events.h \ >- support.h >-md5.o: md5.c md5.h >-menu.o: menu.c feh.h config.h getopt.h structs.h menu.h ipc.h utils.h \ >- debug.h support.h thumbnail.h filelist.h winwidget.h options.h >-multiwindow.o: multiwindow.c feh.h config.h getopt.h structs.h menu.h \ >- ipc.h utils.h debug.h winwidget.h timers.h filelist.h options.h >-options.o: options.c feh.h config.h getopt.h structs.h menu.h ipc.h \ >- utils.h debug.h filelist.h options.h >-slideshow.o: slideshow.c feh.h config.h getopt.h structs.h menu.h ipc.h \ >- utils.h debug.h filelist.h timers.h winwidget.h options.h >-support.o: support.c feh.h config.h getopt.h structs.h menu.h ipc.h \ >- utils.h debug.h filelist.h options.h support.h >-thumbnail.o: thumbnail.c feh.h config.h getopt.h structs.h menu.h ipc.h \ >- utils.h debug.h filelist.h winwidget.h options.h thumbnail.h \ >- md5.h feh_png.h >-timers.o: timers.c feh.h config.h getopt.h structs.h menu.h ipc.h \ >- utils.h debug.h options.h timers.h >-transupp.o: transupp.c transupp.h >-utils.o: utils.c feh.h config.h getopt.h structs.h menu.h ipc.h utils.h \ >- debug.h options.h >-winwidget.o: winwidget.c feh.h config.h getopt.h structs.h menu.h ipc.h \ >- utils.h debug.h filelist.h winwidget.h options.h > >+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) >+ >+-include $(DEP_FILES) >+ >+mostlyclean-depend: >+ >+clean-depend: >+ >+distclean-depend: >+ -rm -rf .deps >+ >+maintainer-clean-depend: >+ >+%.o: %.c >+ @echo '$(COMPILE) -c $<'; \ >+ $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< >+ @-cp .deps/$(*F).pp .deps/$(*F).P; \ >+ tr ' ' '\012' < .deps/$(*F).pp \ >+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ >+ >> .deps/$(*F).P; \ >+ rm .deps/$(*F).pp >+ >+%.lo: %.c >+ @echo '$(LTCOMPILE) -c $<'; \ >+ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< >+ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ >+ < .deps/$(*F).pp > .deps/$(*F).P; \ >+ tr ' ' '\012' < .deps/$(*F).pp \ >+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ >+ >> .deps/$(*F).P; \ >+ rm -f .deps/$(*F).pp > info-am: > info: info-recursive > dvi-am: >@@ -439,24 +433,26 @@ > maintainer-clean-generic: > -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) > mostlyclean-am: mostlyclean-hdr mostlyclean-binPROGRAMS \ >- mostlyclean-compile mostlyclean-tags \ >+ mostlyclean-compile mostlyclean-tags mostlyclean-depend \ > mostlyclean-generic > > mostlyclean: mostlyclean-recursive > > clean-am: clean-hdr clean-binPROGRAMS clean-compile clean-tags \ >- clean-generic mostlyclean-am >+ clean-depend clean-generic mostlyclean-am > > clean: clean-recursive > > distclean-am: distclean-hdr distclean-binPROGRAMS distclean-compile \ >- distclean-tags distclean-generic clean-am >+ distclean-tags distclean-depend distclean-generic \ >+ clean-am > > distclean: distclean-recursive > > maintainer-clean-am: maintainer-clean-hdr maintainer-clean-binPROGRAMS \ > maintainer-clean-compile maintainer-clean-tags \ >- maintainer-clean-generic distclean-am >+ maintainer-clean-depend maintainer-clean-generic \ >+ distclean-am > @echo "This command is intended for maintainers to use;" > @echo "it deletes files that may require special tools to rebuild." > >@@ -472,10 +468,12 @@ > all-recursive check-recursive installcheck-recursive info-recursive \ > dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ > maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ >-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ >-dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \ >-install-exec-am install-exec install-data-am install-data install-am \ >-install uninstall-am uninstall all-redirect all-am all installdirs-am \ >+distclean-tags clean-tags maintainer-clean-tags distdir \ >+mostlyclean-depend distclean-depend clean-depend \ >+maintainer-clean-depend info-am info dvi-am dvi check check-am \ >+installcheck-am installcheck all-recursive-am install-exec-am \ >+install-exec install-data-am install-data install-am install \ >+uninstall-am uninstall all-redirect all-am all installdirs-am \ > installdirs mostlyclean-generic distclean-generic clean-generic \ > maintainer-clean-generic clean mostlyclean distclean maintainer-clean > >diff -ur feh-1.3.4.original/src/ttfonts/Makefile.in feh-1.3.4.edited/src/ttfonts/Makefile.in >--- feh-1.3.4.original/src/ttfonts/Makefile.in 2006-07-08 01:58:47.263079685 +0200 >+++ feh-1.3.4.edited/src/ttfonts/Makefile.in 2006-07-08 02:06:56.626335010 +0200 >@@ -104,9 +104,9 @@ > all: all-redirect > .SUFFIXES: > $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) >- cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps src/ttfonts/Makefile >+ cd $(top_srcdir) && $(AUTOMAKE) --foreign src/ttfonts/Makefile > >-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status >+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) > cd $(top_builddir) \ > && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status > >@@ -138,6 +138,11 @@ > subdir = src/ttfonts > > distdir: $(DISTFILES) >+ here=`cd $(top_builddir) && pwd`; \ >+ top_distdir=`cd $(top_distdir) && pwd`; \ >+ distdir=`cd $(distdir) && pwd`; \ >+ cd $(top_srcdir) \ >+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign src/ttfonts/Makefile > @for file in $(DISTFILES); do \ > d=$(srcdir); \ > if test -d $$d/$$file; then \
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=91176">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 139594
: 91176 |
91177
