diff options
| author |  ridiculousfish <corydoras@ridiculousfish.com> | 2013-03-30 00:13:44 -0700 |
|---|---|---|
| committer | ridiculousfish <corydoras@ridiculousfish.com> | 2013-03-30 00:13:44 -0700 |
| commit | 9762a8ca1eac31ab66dfc16e7c6b688838caee9a (patch) | |
| tree | 2a2fea3dfe05d37af32ce83467e72b53e9de4534 /Makefile.in | |
| parent | e4329f3ae748c37208178a43508a7a1d4314f861 (diff) | |
Remove xsel from the build
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 36 |
1 files changed, 8 insertions, 28 deletions
diff --git a/Makefile.in b/Makefile.in index 6cd355aa..0706fe5f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -197,12 +197,12 @@ DOC_SRC_DIR_FILES := $(HDR_FILES_SRC) $(HELP_SRC) # Files in ./ # -MAIN_DIR_FILES_UNSORTED := Doxyfile Doxyfile.user Doxyfile.help \ - Makefile.in configure configure.ac config.h.in install-sh \ - key_reader.cpp $(MIME_OBJS:.o=.h) \ - $(MIME_OBJS:.o=.cpp) $(FISH_OBJS:.o=.h) $(BUILTIN_FILES) \ - $(COMMON_FILES) $(COMMON_FILES:.cpp=.h) $(FISH_OBJS:.o=.cpp) \ - fish.spec.in INSTALL README user_doc.head.html xsel-0.9.6.tar \ +MAIN_DIR_FILES_UNSORTED := Doxyfile Doxyfile.user Doxyfile.help \ + Makefile.in configure configure.ac config.h.in install-sh \ + key_reader.cpp $(MIME_OBJS:.o=.h) \ + $(MIME_OBJS:.o=.cpp) $(FISH_OBJS:.o=.h) $(BUILTIN_FILES) \ + $(COMMON_FILES) $(COMMON_FILES:.cpp=.h) $(FISH_OBJS:.o=.cpp) \ + fish.spec.in INSTALL README user_doc.head.html \ ChangeLog config.sub config.guess fish_tests.cpp fish.cpp fish_pager.cpp \ fishd.cpp make_vcs_completions.fish $(FISH_INDENT_OBJS:.o=.cpp) @@ -241,16 +241,14 @@ FUNCTIONS_DIR_FILES := $(wildcard share/functions/*.fish) # Programs to install # -SIMPLE_PROGRAMS := fish mimedb fish_pager fishd fish_indent -PROGRAMS := $(SIMPLE_PROGRAMS) @XSEL_BIN@ - +PROGRAMS := fish mimedb fish_pager fishd fish_indent # # Manual pages to install # MANUALS := $(addsuffix .1, $(addprefix share/man/man1/, \ - $(SIMPLE_PROGRAMS))) @XSEL_MAN_PATH@ + $(PROGRAMS))) # @@ -262,13 +260,6 @@ TRANSLATIONS := $(TRANSLATIONS_SRC:.po=.gmo) # -# Extra util -# - -XSEL := @XSEL@ -XSEL_BIN := @XSEL_BIN@ - -# # Make everything needed for installing fish # @@ -342,14 +333,6 @@ test: $(PROGRAMS) fish_tests # -# Build the xsel program, which is maintained in its own tarball -# - -$(XSEL_BIN): - $(MAKE) -C $(XSEL) || echo "Failed to build xsel - either add the required dependencies or use './configure --without-xsel' to disable it." - - -# # commands.hdr collects documentation on all commands, functions and # builtins # @@ -656,7 +639,6 @@ uninstall: uninstall-translations -for i in $(PROGRAMS); do \ rm -f $(DESTDIR)$(bindir)/$$i; \ done; - -rm -f $(DESTDIR)$(bindir)/xsel -rm -rf $(DESTDIR)$(sysconfdir)/fish -if test -d $(DESTDIR)$(datadir)/fish; then \ rm -r $(DESTDIR)$(datadir)/fish; \ @@ -838,7 +820,6 @@ rpm: fish-@PACKAGE_VERSION@.tar.bz2 fish.spec distclean: clean rm -f fish.spec rm -f config.status config.log config.h Makefile - rm -rf $(XSEL) .PHONY: distclean @@ -866,7 +847,6 @@ clean: fi rm -rf fish-@PACKAGE_VERSION@ rm -f $(TRANSLATIONS) - test ! -d "$(XSEL)" || make -C $(XSEL) clean .PHONY: clean |