[Surfraw-commits] [SCM] surfraw - a fast unix command line interface to WWW branch, master, updated. surfraw_2-2-5_1-37-g3be39fc
Ian Beckwith
ianb at erislabs.net
Fri Nov 6 05:00:32 UTC 2009
The following commit has been merged in the master branch:
commit 3be39fca664fe9acd5a8a2d02d6c74ea481a4c9f
Author: Ian Beckwith <ianb at erislabs.net>
Date: Fri Nov 6 04:52:21 2009 +0000
Makefile.am: add examples to SUBDIRS
Move uzbl_load_url_from_surfraw build stuff to examples/Makefile.am
diff --git a/ChangeLog b/ChangeLog
index 49f07c8..fe99ada 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2009-11-06 Ian Beckwith <ianb at erislabs.net>
+ * Add examples/ to SUBDIRS, move uzbl_load_url_from_surfraw
+ build logic to examples/Makefile.am
* examples/uzbl_load_url_from_surfraw:
+ Applied patch from Sumant Oemrawsingh to strip "GLOBAL ELVI"
and "LOCALELVI" and support vertical menus if patched dmenu is
diff --git a/Makefile.am b/Makefile.am
index 8fa5d6b..5102cd3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,11 @@
# $Id$
-SUBDIRS = elvi test
+SUBDIRS = elvi test examples
bin_SCRIPTS = surfraw surfraw-update-path
-noinst_SCRIPTS = examples/uzbl_load_url_from_surfraw
if OPENSEARCH
dist_bin_SCRIPTS = opensearch-discover opensearch-genquery
endif
devel_extra = banner prebuild
-examples_extra = examples/README examples/uzbl_load_url_from_surfraw.IN
noinst_DATA = surfraw-bash-completion
man_MANS = surfraw-update-path.1 surfraw.1 elvi.1sr
if OPENSEARCH
@@ -17,12 +15,11 @@ EXTRA_DIST = surfraw.lsm.in surfraw.IN surfraw-update-path.IN\
surfraw.spec.in aclocal.m4 HACKING Makefile.include \
surfraw.1.IN elvi.1sr.IN surfraw.bookmarks links.IN \
surfraw-bash-completion.IN surfraw.conf.IN \
- $(devel_extra) $(examples_extra)
+ $(devel_extra)
CLEANFILES = surfraw surfraw-update-path surfraw-update-path.1 surfraw.spec surfraw.lsm \
surfraw.1 elvi.1sr links surfraw-bash-completion surfraw.conf surfraw.1 \
- elvi.1sr opensearch-discover.1 opensearch-genquery.1 \
- examples/uzbl_load_url_from_surfraw
+ elvi.1sr opensearch-discover.1 opensearch-genquery.1
surfraw: surfraw.IN
@@ -36,8 +33,6 @@ elvi.1sr: elvi.1sr.IN
surfraw.1: surfraw.1.IN
-uzbl_load_url_from_surfraw: uzbl_load_url_from_surfraw.IN
-
surfraw-update-path.1 opensearch-discover.1 opensearch-genquery.1: %.1: %
-rm -f $@
pod2man $< > $@
diff --git a/Makefile.in b/Makefile.in
index c21535b..f948cf0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -76,7 +76,7 @@ am__base_list = \
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
"$(DESTDIR)$(man1dir)"
am__dist_bin_SCRIPTS_DIST = opensearch-discover opensearch-genquery
-SCRIPTS = $(bin_SCRIPTS) $(dist_bin_SCRIPTS) $(noinst_SCRIPTS)
+SCRIPTS = $(bin_SCRIPTS) $(dist_bin_SCRIPTS)
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -212,24 +212,21 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
# $Id$
-SUBDIRS = elvi test
+SUBDIRS = elvi test examples
bin_SCRIPTS = surfraw surfraw-update-path
-noinst_SCRIPTS = examples/uzbl_load_url_from_surfraw
@OPENSEARCH_TRUE at dist_bin_SCRIPTS = opensearch-discover opensearch-genquery
devel_extra = banner prebuild
-examples_extra = examples/README examples/uzbl_load_url_from_surfraw.IN
noinst_DATA = surfraw-bash-completion
man_MANS = surfraw-update-path.1 surfraw.1 elvi.1sr $(am__append_1)
EXTRA_DIST = surfraw.lsm.in surfraw.IN surfraw-update-path.IN\
surfraw.spec.in aclocal.m4 HACKING Makefile.include \
surfraw.1.IN elvi.1sr.IN surfraw.bookmarks links.IN \
surfraw-bash-completion.IN surfraw.conf.IN \
- $(devel_extra) $(examples_extra)
+ $(devel_extra)
CLEANFILES = surfraw surfraw-update-path surfraw-update-path.1 surfraw.spec surfraw.lsm \
surfraw.1 elvi.1sr links surfraw-bash-completion surfraw.conf surfraw.1 \
- elvi.1sr opensearch-discover.1 opensearch-genquery.1 \
- examples/uzbl_load_url_from_surfraw
+ elvi.1sr opensearch-discover.1 opensearch-genquery.1
all: all-recursive
@@ -842,8 +839,6 @@ elvi.1sr: elvi.1sr.IN
surfraw.1: surfraw.1.IN
-uzbl_load_url_from_surfraw: uzbl_load_url_from_surfraw.IN
-
surfraw-update-path.1 opensearch-discover.1 opensearch-genquery.1: %.1: %
-rm -f $@
pod2man $< > $@
diff --git a/configure b/configure
index 6872aa1..a5e86ed 100755
--- a/configure
+++ b/configure
@@ -2391,7 +2391,7 @@ fi
done
-ac_config_files="$ac_config_files Makefile surfraw.lsm surfraw.spec elvi/Makefile test/Makefile"
+ac_config_files="$ac_config_files Makefile surfraw.lsm surfraw.spec elvi/Makefile test/Makefile examples/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -3104,6 +3104,7 @@ do
"surfraw.spec") CONFIG_FILES="$CONFIG_FILES surfraw.spec" ;;
"elvi/Makefile") CONFIG_FILES="$CONFIG_FILES elvi/Makefile" ;;
"test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
+ "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
*) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
diff --git a/configure.in b/configure.in
index 62b52d0..05b1b13 100644
--- a/configure.in
+++ b/configure.in
@@ -52,6 +52,6 @@ dnl Checks for programs.
AC_PROG_INSTALL
AC_PROG_AWK
-AC_CONFIG_FILES([Makefile surfraw.lsm surfraw.spec elvi/Makefile test/Makefile])
+AC_CONFIG_FILES([Makefile surfraw.lsm surfraw.spec elvi/Makefile test/Makefile examples/Makefile])
AC_OUTPUT
diff --git a/examples/Makefile.am b/examples/Makefile.am
new file mode 100644
index 0000000..7cf8706
--- /dev/null
+++ b/examples/Makefile.am
@@ -0,0 +1,7 @@
+noinst_SCRIPTS = uzbl_load_url_from_surfraw
+EXTRA_DIST = README uzbl_load_url_from_surfraw.IN
+CLEANFILES = examples/uzbl_load_url_from_surfraw
+
+uzbl_load_url_from_surfraw: uzbl_load_url_from_surfraw.IN
+
+include $(top_srcdir)/Makefile.include
diff --git a/test/Makefile.in b/examples/Makefile.in
similarity index 84%
copy from test/Makefile.in
copy to examples/Makefile.in
index 4a19a6e..5a84ac2 100644
--- a/test/Makefile.in
+++ b/examples/Makefile.in
@@ -14,6 +14,9 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
+
+# $Id$
+
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
@@ -31,8 +34,9 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-subdir = test
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(top_srcdir)/Makefile.include
+subdir = examples
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -40,6 +44,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+SCRIPTS = $(noinst_SCRIPTS)
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -119,32 +124,13 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-EXTRA_DIST = runtests elviwithouttests README COOKIES W.test \
- alioth.test altavista.test amazon.test archpkg.test arxiv.test \
- ask.test aur.test austlii.test bbcnews.test cddb.test cia.test \
- cite.test cnn.test codesearch.test comlaw.test ctan.test \
- currency.test cve.test debbugs.test debcontents.test \
- deblists.test deblogs.test debpackages.test debpts.test \
- debsec.test debvcsbrowse.test debwiki.test deja.test \
- discogs.test dmoz.test ebay.test etym.test excite.test \
- fast.test filesearching.test foldoc.test freebsd.test \
- freedb.test freshmeat.test fsfdir.test genbugs.test \
- genpkg.test genportage.test google.test gutenberg.test \
- happypenguin.test imdb.test ixquick.test javasun.test \
- lastfm.test leodict.test lsm.test musicbrainz.test netbsd.test \
- ntrs.test openbsd.test opensearch.test piratebay.test \
- port.test pgpkeys.test pubmed.test rae.test rfc.test \
- rhyme.test scholar.test scicom.test scpan.test slashdot.test \
- slinuxdoc.test sourceforge.test springer.test stockquote.test \
- sunonesearch.test thesaurus.test translate.test urban.test \
- w3css.test w3html.test w3link.test w3rdf.test wayback.test \
- webster.test wetandwild.test wikipedia.test woffle.test \
- yahoo.test yubnub.test
-
+noinst_SCRIPTS = uzbl_load_url_from_surfraw
+EXTRA_DIST = README uzbl_load_url_from_surfraw.IN
+CLEANFILES = examples/uzbl_load_url_from_surfraw
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/Makefile.include $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -153,9 +139,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu test/Makefile
+ $(AUTOMAKE) --gnu examples/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -213,7 +199,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
-all-am: Makefile
+all-am: Makefile $(SCRIPTS)
installdirs:
install: install-am
install-exec: install-exec-am
@@ -232,6 +218,7 @@ install-strip:
mostlyclean-generic:
clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -319,9 +306,21 @@ uninstall-am:
mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
-test:
- ./runtests
- ./elviwithouttests
+uzbl_load_url_from_surfraw: uzbl_load_url_from_surfraw.IN
+
+%: %.IN
+ -rm -f $@ $@.tmp
+ sed -e 's, at bindir\@,${bindir},g; '\
+ -e 's, at mandir\@,${mandir},g; '\
+ -e 's, at VERSION\@,${VERSION},g; '\
+ -e 's, at prefix\@,${prefix},g; '\
+ -e 's, at ELVIDIR\@,${ELVIDIR},g; '\
+ -e 's, at AWK\@,${AWK},g; '\
+ -e 's, at TEXTBROWSER\@,${TEXTBROWSER},g; '\
+ -e 's, at GRAPHICALBROWSER\@,${GRAPHICALBROWSER},g; '\
+ -e 's, at sysconfdir\@,${sysconfdir},g' $< >$@.tmp
+ chmod +x $@.tmp
+ mv $@.tmp $@
# 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.
--
surfraw - a fast unix command line interface to WWW
More information about the Surfraw-commits
mailing list