From fdf421eb8ceb97ee01105a2b47850d96e994aa87 Mon Sep 17 00:00:00 2001 From: Henning Geinitz Date: Mon, 21 May 2001 20:20:54 +0000 Subject: [PATCH] Added target "uninstall". Henning Meier-Geinitz --- Makefile.in | 10 +++++++--- backend/Makefile.in | 6 +++++- doc/Makefile.in | 17 ++++++++++++++++- frontend/Makefile.in | 10 +++++++++- lib/Makefile.in | 4 +++- sanei/Makefile.in | 4 +++- tools/Makefile.in | 5 ++++- 7 files changed, 47 insertions(+), 9 deletions(-) diff --git a/Makefile.in b/Makefile.in index e44857aae..90c081fc6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -54,6 +54,9 @@ install: install-recursive $(INSTALL_DATA) $${file} $(includedir)/sane || exit 1; \ done +uninstall: uninstall-recursive + rm -rf $(includedir)/sane + # # Keep the .cvsignore files sorted, and use this target to do it. # @@ -74,8 +77,8 @@ distclean: clean distclean-recursive depend: depend-recursive all-recursive install-recursive clean-recursive distclean-recursive \ -depend-recursive: - for subdir in $(SUBDIRS); do \ +depend-recursive uninstall-recursive: + @for subdir in $(SUBDIRS); do \ target=`echo $@ | sed s/-recursive//`; \ echo making $$target in $$subdir; \ (cd $$subdir && $(MAKE) $$target) \ @@ -83,4 +86,5 @@ depend-recursive: done && test -z "$$fail" .PHONY: all clean depend \ - all-recursive install-recursive clean-recursive depend-recursive + all-recursive install-recursive clean-recursive depend-recursive \ + uninstall-recursive diff --git a/backend/Makefile.in b/backend/Makefile.in index 5c1ddd879..86865ecd8 100644 --- a/backend/Makefile.in +++ b/backend/Makefile.in @@ -127,6 +127,10 @@ install: fi; \ done +uninstall: + rm -rf $(libsanedir) $(configdir) + rm -f $(libdir)/libsane.* + dll.lo: dll-preload.c dll-preload.c: @@ -293,4 +297,4 @@ clean: distclean: clean rm -f Makefile libsane.so -.PHONY: all install depend clean distclean +.PHONY: all install depend clean distclean uninstall diff --git a/doc/Makefile.in b/doc/Makefile.in index cf1b2322c..df465885b 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -100,6 +100,21 @@ install: all $(INSTALL_DATA) $${doc} $(docdir)/$${doc}; \ done +uninstall: + @for page in $(SECT1); do \ + echo removing $${page} in $(mandir)/man1/$${page}...; \ + rm -f $(mandir)/man1/$${page}; \ + done + @for page in $(SECT5); do \ + echo removing $${page} in $(mandir)/man5/$${page}...; \ + rm -f $(mandir)/man5/$${page}; \ + done + @for page in $(SECT7); do \ + echo removing $${page} in $(mandir)/man7/$${page}...; \ + rm -f $(mandir)/man7/$${page}; \ + done + rm -rf $(docdir) + sane.ind: sane.tex net.tex @echo Generating index for sane.ps... @touch sane.ind @@ -167,4 +182,4 @@ distclean: clean depend: -.PHONY: all install depend clean html html-man sane-html install-mostang +.PHONY: all install depend clean html html-man sane-html install-mostang uninstall diff --git a/frontend/Makefile.in b/frontend/Makefile.in index cd6f69f2c..2b8243a79 100644 --- a/frontend/Makefile.in +++ b/frontend/Makefile.in @@ -71,6 +71,14 @@ install: $(PROGRAMS) $(sbindir)/$${program}; \ done +uninstall: + @for program in $(BINPROGS); do \ + rm -f $(bindir)/$${program}; \ + done + @for program in $(SBINPROGS); do \ + rm -f $(sbindir)/$${program}; \ + done + test: test.o $(LIBSANE) $(LIBLIB) @$(LIBTOOL) $(MLINK) $(LINK) test.o $(LIBSANE) $(LIBLIB) $(LIBS) @@ -91,4 +99,4 @@ distclean: clean depend: makedepend $(INCLUDES) *.c -.PHONY: all install depend clean distclean +.PHONY: all install depend clean distclean uninstall diff --git a/lib/Makefile.in b/lib/Makefile.in index f405872b7..e44c845f6 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -66,6 +66,8 @@ liblib.a: $(LIBLIB_OBJS) install: +uninstall: + check: depend: @@ -78,4 +80,4 @@ clean: distclean: clean rm -f Makefile -.PHONY: all install check depend clean distclean +.PHONY: all install check depend clean distclean uninstall diff --git a/sanei/Makefile.in b/sanei/Makefile.in index 227786b88..e8a5ac4b2 100644 --- a/sanei/Makefile.in +++ b/sanei/Makefile.in @@ -70,6 +70,8 @@ libsanei.a: $(LIBSANEI_OBJS) install: +uninstall: + check: test_wire ./test_wire @@ -89,4 +91,4 @@ clean: distclean: clean rm -f Makefile -.PHONY: all install check depend clean distclean +.PHONY: all install check depend clean distclean uninstall diff --git a/tools/Makefile.in b/tools/Makefile.in index a13083cfa..fefbe83eb 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -69,6 +69,9 @@ install: sane-config sane-find-scanner $(INSTALL_SCRIPT) sane-config $(bindir)/sane-config $(INSTALL_PROGRAM) sane-find-scanner $(bindir)/sane-find-scanner +uninstall: + rm -f $(bindir)/sane-config $(bindir)/sane-find-scanner + sane-config: sane-config.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -94,4 +97,4 @@ clean: distclean: clean rm -f Makefile $(DESTINATIONS) mustek600IIn-off -.PHONY: all install depend clean distclean +.PHONY: all install depend clean distclean uninstall