diff options
Diffstat (limited to 'lib/am/ltlib.am')
| -rw-r--r-- | lib/am/ltlib.am | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/lib/am/ltlib.am b/lib/am/ltlib.am index bdd014087..f6cff5b3f 100644 --- a/lib/am/ltlib.am +++ b/lib/am/ltlib.am @@ -14,10 +14,6 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see <http://www.gnu.org/licenses/>. -if %?INSTALL% -include inst-vars.am -endif %?INSTALL% - ## ------------ ## ## Installing. ## ## ------------ ## @@ -91,10 +87,10 @@ if %?INSTALL% .PHONY uninstall-am: uninstall-%DIR%LTLIBRARIES uninstall-%DIR%LTLIBRARIES: @$(NORMAL_UNINSTALL) - @list='$(%DIR%_LTLIBRARIES)'; test -n "$(%NDIR%dir)" || list=; \ - for p in $$list; do \ -?BASE? $(am__strip_dir) \ -?!BASE? f=$$p; \ +?BASE? @list='$(notdir $(%DIR%_LTLIBRARIES))'; \ +?!BASE? @list='$(%DIR%_LTLIBRARIES)'; \ + test -n "$(%NDIR%dir)" || list=; \ + for f in $$list; do \ ?LIBTOOL? echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(%NDIR%dir)/$$f'"; \ ?LIBTOOL? $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(%NDIR%dir)/$$f"; \ ?!LIBTOOL? echo " rm -f '$(DESTDIR)$(%NDIR%dir)/$$f'"; \ @@ -107,17 +103,8 @@ endif %?INSTALL% ## Cleaning. ## ## ---------- ## -.PHONY clean-am: clean-%DIR%LTLIBRARIES -clean-%DIR%LTLIBRARIES: - -test -z "$(%DIR%_LTLIBRARIES)" || rm -f $(%DIR%_LTLIBRARIES) +am.clean.normal.f += $(%DIR%_LTLIBRARIES) ## 'so_locations' files are created by some linkers (IRIX, OSF) when ## building a shared object. Libtool places these files in the ## directory where the shared object is created. - @list='$(%DIR%_LTLIBRARIES)'; \ - locs=`for p in $$list; do echo $$p; done | \ - sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ - sort -u`; \ - test -z "$$locs" || { \ - echo rm -f $${locs}; \ - rm -f $${locs}; \ - } +am.clean.normal.f += $(wildcard $(addsuffix so_locations,$(sort $(dir $(%DIR%_LTLIBRARIES))))) |