Arrange for "make clean" to remove the symlink, too.

* make.tmpl.in ($(VERSIONED_SHLIB)): Move rule to...
* lib/Makefile.in ($(VERSIONED_SHLIB)): ...here, removing the
$(interface)/ prefix.
Reported by Milan Broz.

Author: Jim Meyering <meyering@redhat.com>

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 1e0a017d359828f06d98fb80a9a5d2068e3139e0..f1939bc4edf4d0378265d16083a6d4890faa2c8c 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -41,7 +41,7 @@ ifeq ("@LIB_SUFFIX@","dylib")
 else
   LIB_SHARED = $(interface)/libdevmapper.so
 endif
-VERSIONED_SHLIB = $(interface)/libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION)
+VERSIONED_SHLIB = libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION)
 
 DEFS += -DDEVICE_UID=@DEVICE_UID@ -DDEVICE_GID=@DEVICE_GID@ \
        -DDEVICE_MODE=@DEVICE_MODE@
@@ -87,10 +87,13 @@ install_ioctl_static: ioctl/libdevmapper.a
        $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
                $(libdir)/libdevmapper.a.$(LIB_VERSION)
 
+$(VERSIONED_SHLIB): %.$(LIB_SUFFIX).$(LIB_VERSION): $(interface)/%.$(LIB_SUFFIX)
+       rm -f $@
+       $(LN_S) $< $@
+
 .PHONY: distclean_lib distclean
 
-distclean_lib: 
+distclean_lib:
        $(RM) libdevmapper.pc
 
 distclean: distclean_lib
-

diff --git a/make.tmpl.in b/make.tmpl.in
index eab760c21d3539126a96010bd83ef11a3a76288f..fa422e957a5945abdba119153fc2bebbf18c1c15 100644 (file)
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -172,10 +172,6 @@ $(LIB_SHARED): $(OBJECTS) $(LDDEPS)
        $(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
 endif
 
-$(VERSIONED_SHLIB): %.$(LIB_SUFFIX).$(LIB_VERSION): %.$(LIB_SUFFIX)
-       rm -f $(notdir $@)
-       $(LN_S) $< $(notdir $@)
-
 $(LIB_STATIC): $(OBJECTS)
        $(RM) $@
        $(AR) rs $@ $(OBJECTS)