diff options
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 38 |
1 files changed, 11 insertions, 27 deletions
diff --git a/Makefile.in b/Makefile.in index d048a1aa..8cce25c5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -107,15 +107,6 @@ FISH_TESTS_OBJS := $(FISH_OBJS) obj/fish_tests.o # -# All objects needed to build mimedb -# - -MIME_OBJS := obj/mimedb.o obj/print_help.o obj/xdgmimealias.o obj/xdgmime.o \ - obj/xdgmimeglob.o obj/xdgmimeint.o obj/xdgmimemagic.o obj/xdgmimeparent.o \ - obj/wutil.o obj/common.o obj/fish_version.o - - -# # Files containing user documentation # @@ -173,7 +164,7 @@ FUNCTIONS_DIR_FILES := $(wildcard share/functions/*.fish) # Programs to install # -PROGRAMS := fish mimedb fish_indent +PROGRAMS := fish fish_indent # # Manual pages to install @@ -556,6 +547,16 @@ check-legacy-binaries: echo "An outdated set_color from a previous fish install was found. You should remove it with:";\ echo " rm '$$SETCOLOR_LOC'";\ fi; + @MIMEDB_LOC=$(prefix)/bin/mimedb;\ + if test -x "$$MIMEDB_LOC" && $$MIMEDB_LOC --version 2>&1 | grep -q "^mimedb, version "; then\ + echo "An outdated mimedb binary from a previous fish install was found. You should remove it with:";\ + echo " rm '$$MIMEDB_LOC'";\ + fi; + @FISHD_LOC=$(prefix)/bin/fishd;\ + if test -x "$$FISHD_LOC" && $$FISHD_LOC --version 2>&1 | grep -q "^fishd: fishd, version "; then\ + echo "An outdated fishd binary from a previous fish install was found. You should remove it with:";\ + echo " rm '$$FISHD_LOC'";\ + fi; @true; .PHONY: check-legacy-binaries @@ -782,14 +783,6 @@ fish_tests: $(FISH_TESTS_OBJS) # -# Build the mimedb program. -# - -mimedb: $(MIME_OBJS) - $(CXX) $(CXXFLAGS) $(LDFLAGS) $(MIME_OBJS) $(LIBS) -o $@ - - -# # Build the fish_indent program. # @@ -1010,8 +1003,6 @@ src/kill.o: config.h src/signal.h src/fallback.h src/util.h src/wutil.h src/kill.o: src/common.h src/kill.h src/proc.h src/io.h src/parse_tree.h src/kill.o: src/tokenizer.h src/parse_constants.h src/sanity.h src/env.h src/kill.o: src/exec.h src/path.h -src/mimedb.o: config.h src/xdgmime.h src/fallback.h src/signal.h src/util.h -src/mimedb.o: src/print_help.h src/fish_version.h src/output.o: config.h src/signal.h src/fallback.h src/util.h src/wutil.h src/output.o: src/common.h src/expand.h src/parse_constants.h src/output.h src/output.o: src/screen.h src/highlight.h src/env.h src/color.h @@ -1098,10 +1089,3 @@ src/wildcard.o: src/env.h src/color.h src/exec.h src/proc.h src/parse_tree.h src/wildcard.o: src/tokenizer.h src/wutil.o: config.h src/fallback.h src/signal.h src/util.h src/common.h src/wutil.o: src/wutil.h -src/xdgmime.o: src/xdgmime.h src/xdgmimeint.h src/xdgmimeglob.h -src/xdgmime.o: src/xdgmimemagic.h src/xdgmimealias.h src/xdgmimeparent.h -src/xdgmimealias.o: src/xdgmimealias.h src/xdgmime.h src/xdgmimeint.h -src/xdgmimeglob.o: src/xdgmimeglob.h src/xdgmime.h src/xdgmimeint.h -src/xdgmimeint.o: src/xdgmimeint.h src/xdgmime.h -src/xdgmimemagic.o: src/xdgmimemagic.h src/xdgmime.h src/xdgmimeint.h -src/xdgmimeparent.o: src/xdgmimeparent.h src/xdgmime.h src/xdgmimeint.h |