diff options
| author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2008-09-07 09:25:02 +0200 |
|---|---|---|
| committer | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2008-09-07 09:33:07 +0200 |
| commit | 7c02797d0d5985627fdb50f15a15b6076f8f8843 (patch) | |
| tree | d7fba2f168192b6b5414e7b952818081ea8287f1 /lib/am/data.am | |
| parent | f4d1f9e29866e785d5d50d9037dade2b773cd71f (diff) | |
| download | automake-7c02797d0d5985627fdb50f15a15b6076f8f8843.tar.gz | |
Faster `make uninstall'; fast install for JAVA.
* lib/am/inst-vars.am (am__nobase_strip_setup)
(am__nobase_strip): New macros.
(am__nobase_list): Factorize.
* lib/am/data.am (uninstall-%DIR%%PRIMARY%): Use them, for a
constant number of forks per uninstall.
* lib/am/libs.am (uninstall-%DIR%LIBRARIES): Likewise.
* lib/am/lisp.am (uninstall-%DIR%LISP): Likewise.
* lib/am/progs.am (uninstall-%DIR%PROGRAMS): Fast uninstall.
* lib/am/python.am (uninstall-%DIR%PYTHON): Fast uninstall.
Echo all `rm' commands that are are executed.
* lib/am/java.am (install-%DIR%JAVA, uninstall-%DIR%JAVA):
Fast install and uninstall.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Diffstat (limited to 'lib/am/data.am')
| -rw-r--r-- | lib/am/data.am | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/am/data.am b/lib/am/data.am index a7039c0c2..63db01d65 100644 --- a/lib/am/data.am +++ b/lib/am/data.am @@ -70,12 +70,12 @@ if %?INSTALL% .PHONY uninstall-am: uninstall-%DIR%%PRIMARY% uninstall-%DIR%%PRIMARY%: @$(NORMAL_UNINSTALL) -?!BASE? @$(am__vpath_adj_setup) \ - %BASE?@%list='$(%DIR%_%PRIMARY%)'; for p in $$list; do \ - %BASE?$(am__strip_dir):$(am__vpath_adj)% \ - echo " rm -f '$(DESTDIR)$(%NDIR%dir)/$$f'"; \ - rm -f "$(DESTDIR)$(%NDIR%dir)/$$f"; \ - done + @list='$(%DIR%_%PRIMARY%)'; \ +?BASE? files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ +?!BASE? $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(%NDIR%dir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(%NDIR%dir)" && rm -f $$files endif %?INSTALL% |