change the way we interact with libtool and do .deb packaging for

consistency between all packages.

16 files changed, 177 insertions, 175 deletions

diff --git a/Makefile b/Makefile
index 9f15a9b..b095495 100644
--- a/Makefile
+++ b/Makefile
@@ -38,14 +38,10 @@ include $(TOPDIR)/include/builddefs
 endif
 
 CONFIGURE = configure include/builddefs
-LIBTOOL_LSRCFILES = config.guess config.sub ltmain.sh ltconfig \
-		aclocal.m4
-LIBTOOL_DIRT = libtool
 LSRCFILES = configure configure.in Makepkgs install-sh README VERSION
-LSRCFILES += $(LIBTOOL_LSRCFILES)
+
 LDIRT = config.log config.status config.cache confdefs.h conftest* \
-	configure Logs/* built install.* install-dev.* *.gz \
-	$(LIBTOOL_DIRT)
+	Logs/* built .census install.* install-dev.* *.gz
 
 SUBDIRS = include libdm man doc debian build
 
@@ -62,10 +58,10 @@ else
 clean:	# if configure hasn't run, nothing to clean
 endif
 
-$(CONFIGURE): configure.in include/builddefs.in VERSION
-	rm -f config.cache
+$(CONFIGURE):
 	autoconf
 	./configure
+	touch .census
 
 install: default
 	$(SUBDIRS_MAKERULE)
diff --git a/Makepkgs b/Makepkgs
index 731cfb0..e56d754 100755
--- a/Makepkgs
+++ b/Makepkgs
@@ -64,6 +64,7 @@ fi
 
 echo
 echo "== configure, log is $LOGDIR/configure"
+rm -f .census	# force configure to run here
 if $verbose ; then
 	autoconf 2>&1 | tee $LOGDIR/configure
 	./configure 2>&1 | tee -a $LOGDIR/configure
diff --git a/VERSION b/VERSION
index 976b5d4..da35309 100644
--- a/VERSION
+++ b/VERSION
@@ -2,6 +2,6 @@
 # This file is used by configure to get version information
 #
 PKG_MAJOR=0
-PKG_MINOR=1
-PKG_REVISION=2
+PKG_MINOR=2
+PKG_REVISION=0
 PKG_BUILD=0
diff --git a/build/rpm/dmapi.spec.in b/build/rpm/dmapi.spec.in
index c47408f..34a614b 100644
--- a/build/rpm/dmapi.spec.in
+++ b/build/rpm/dmapi.spec.in
@@ -5,7 +5,7 @@ Release: @pkg_release@
 Distribution: @pkg_distribution@
 Packager: @pkg_builder@
 BuildRoot: @build_root@ 
-Prereq: /sbin/ldconfig /usr/bin/libtool
+Prereq: /sbin/ldconfig
 Source: @pkg_name@-@pkg_version@.src.tar.gz
 Copyright: Copyright (C) 2000 Silicon Graphics, Inc.
 Vendor: Silicon Graphics, Inc.
diff --git a/configure.in b/configure.in
index 2df22cc..2dca568 100644
--- a/configure.in
+++ b/configure.in
@@ -3,11 +3,6 @@ AC_INIT(include/dmapi.h)
 pkg_name="dmapi"
 AC_SUBST(pkg_name)
 
-# For libtool
-AC_PROG_LIBTOOL
-AC_SUBST(LIBTOOL_DEPS)
-AC_SUBST(enable_shared)
-
 #
 # Note: the following environment variables may be set to override the
 # defaults (to change paths and/or executables, build parameters, etc):
@@ -40,13 +35,7 @@ pkg_release=$PKG_BUILD
 AC_SUBST(pkg_version)
 AC_SUBST(pkg_release)
 
-# For libtool versioning.
-pkg_lt_version=${PKG_LT_CURRENT}.${PKG_LT_REVISION}.${PKG_LT_AGE}
-pkg_lt_current=$PKG_LT_CURRENT
-AC_SUBST(pkg_lt_version)
-AC_SUBST(pkg_lt_current)
-
-pkg_distribution="SGI ProPack"
+pkg_distribution="SGI XFS"
 test -z "$DISTRIBUTION" || pkg_distribution="$DISTRIBUTION"
 AC_SUBST(pkg_distribution)
 
@@ -116,6 +105,23 @@ AC_CHECK_HEADER(xfs/handle.h,, [
 	exit 1
 ])
 
+dnl ensure libtool is installed
+AC_PATH_PROG(LIBTOOL, libtool,,/usr/bin)
+if test "$LIBTOOL" = ""; then
+	echo
+	echo 'FATAL ERROR: libtool does not seem to be installed.'
+	echo $pkg_name cannot be built without a working libtool installation.
+	exit 1
+fi
+libtool=$LIBTOOL
+AC_SUBST(libtool)
+
+dnl libtool to build libraries static only?
+AC_ARG_ENABLE(enable_shared,
+	[ --enable-shared=[yes/no]	Enable use of shared libraries [default=yes].],
+	,
+	enable_shared=yes)
+AC_SUBST(enable_shared)
 
 dnl alternate root and usr prefixes
 test -z "$ROOT_PREFIX" && ROOT_PREFIX=""
@@ -168,13 +174,6 @@ dnl
 dnl output files
 dnl
 
-#For libtool, from section 5.4.2 of the libtool manual.  Just in
-# case we ever need them.
-LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'`
-AC_SUBST(LTLIBOBJS)
-LTALLOCA=`echo "$ALLOCA" | sed 's/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'`
-AC_SUBST(LTALLOCA)
-
 AC_OUTPUT( \
 dnl  Build definitions for use in Makefiles
     include/builddefs \
diff --git a/debian/Makefile b/debian/Makefile
index 5987042..b3d3d7b 100644
--- a/debian/Makefile
+++ b/debian/Makefile
@@ -34,7 +34,22 @@ TOPDIR = ..
 include $(TOPDIR)/include/builddefs
 
 LSRCFILES = changelog control copyright rules
+DEV_DOC_DIR = $(PKG_DOC_DIR)/../$(PKG_NAME)-dev
 
-default install install-dev:
+default:
 
 include $(BUILDRULES)
+
+install: default
+ifeq ($(PKG_DISTRIBUTION), debian)
+	$(INSTALL) -m 755 -d $(PKG_DOC_DIR)
+	$(INSTALL) -m 644 changelog $(PKG_DOC_DIR)/changelog.Debian
+endif
+
+install-dev: default
+ifeq ($(PKG_DISTRIBUTION), debian)
+	$(INSTALL) -m 755 -d $(PKG_DOC_DIR)
+	$(INSTALL) -m 755 -d $(DEV_DOC_DIR)
+	$(INSTALL) -m 644 copyright $(DEV_DOC_DIR)
+	$(INSTALL) -m 644 changelog $(DEV_DOC_DIR)/changelog.Debian
+endif
diff --git a/debian/changelog b/debian/changelog
index 133a14d..1568b09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+dmapi (0.2.0-0) unstable; urgency=low
+
+  * Reworked package slightly so that its not Debian native
+  * Debian-specific changes now documented in changelog.Debian.gz
+  * New upstream release (see /usr/share/doc/dmapi/changelog.gz)
+
+ -- Nathan Scott <nathans@debian.org>  Thu, 19 Jul 2001 17:14:40 +1000
+
 dmapi (0.1.0) unstable; urgency=low
 
   * Initial release.
diff --git a/debian/control b/debian/control
index 404991d..dc67587 100644
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,12 @@ Source: dmapi
 Section: admin
 Priority: optional
 Maintainer: Nathan Scott <nathans@debian.org>
-Build-Depends: autoconf, debmake, xfsprogs-dev
+Build-Depends: xfslibs-dev, autoconf, debmake, libtool
 Standards-Version: 3.1.1
 
 Package: dmapi
 Depends: ${shlibs:Depends}
+Recommends: xfsdump
 Architecture: any
 Description: Data Management API runtime environment
  Files required by system software using the Data Management API
diff --git a/debian/rules b/debian/rules
index 8f0b348..0837247 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,8 +5,6 @@ develop = $(package)-dev
 
 dirtmp = debian/tmp
 dirdev = debian/$(develop)
-doctmp = /usr/share/doc/$(package)
-docdev = /usr/share/doc/$(develop)
 pkgtmp = DIST_ROOT=`pwd`/$(dirtmp); export DIST_ROOT;
 pkgdev = DIST_ROOT=`pwd`/$(dirdev); export DIST_ROOT;
 stdenv = GZIP=-q; export GZIP;
@@ -16,18 +14,23 @@ options = DEBUG="-DNDEBUG"; OPTIMIZER="-O1 -g"; DISTRIBUTION="debian"; \
 checkdir = test -f debian/rules
 
 build: built
-built:
+built: config
 	@echo "== dpkg-buildpackage: build" 1>&2
+	$(MAKE) default
+	touch built
+
+config: .census
+.census:
+	@echo "== dpkg-buildpackage: configure" 1>&2
 	$(checkdir)
 	autoconf
 	$(options) ./configure
-	$(MAKE) default
-	touch built
+	touch .census
 
 clean:
 	@echo "== dpkg-buildpackage: clean" 1>&2
 	$(checkdir)
-	-rm -f built
+	-rm -f built .census
 	$(MAKE) distclean
 	-rm -rf $(dirtmp) $(dirdev) debian/*substvars debian/files*
 
@@ -40,11 +43,9 @@ binary-arch: checkroot built
 	$(pkgtmp) $(MAKE) -C . install
 	$(pkgdev) $(MAKE) -C . install-dev
 	$(pkgtmp) $(MAKE) -C build src-manifest
-	$(pkgdev) ./install-sh -m 755 -d $(doctmp)
-	$(pkgdev) ./install-sh -m 755 -d $(docdev)
-	$(pkgdev) ./install-sh -m 644 debian/copyright $(docdev)
-	$(pkgdev) ./install-sh -m 644 debian/changelog $(docdev)
 	@echo "== dpkg-buildpackage: debstd" 1>&2
+	# Note: dev pkg with .so symlinks to base pkg confuses debstd;
+	# so the .so 'Dangling symlink' message below is benign.
 	$(stdenv) debstd -m
 	dpkg-gencontrol -isp -p$(package) -P$(dirtmp)
 	dpkg-gencontrol -isp -p$(develop) -P$(dirdev)
diff --git a/doc/CHANGES b/doc/CHANGES
index 491033f..f9c184b 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,3 +1,7 @@
+attr-0.2.0 (19 Jul 2001)
+	- reworked Makefiles use of libtool slightly
+	- rework some of the Debian packaging rules
+
 dmapi-0.1.2 (18 July 2001)
 	- change dmapi to use /proc instead of /dev/dmapi
 
diff --git a/doc/Makefile b/doc/Makefile
index 8ee4ec9..68d92d7 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -36,7 +36,7 @@ include $(TOPDIR)/include/builddefs
 LSRCFILES = INSTALL PORTING CHANGES COPYING
 LDIRT = *.gz
 
-default: $(CMDTARGET) CHANGES.gz
+default: CHANGES.gz
 
 include $(BUILDRULES)
 
@@ -45,8 +45,11 @@ CHANGES.gz:
 
 install: default
 	$(INSTALL) -m 755 -d $(PKG_DOC_DIR)
-ifneq ($(PKG_DISTRIBUTION), debian)
+	$(INSTALL) -m 644 PORTING CHANGES.gz $(PKG_DOC_DIR)
+ifeq ($(PKG_DISTRIBUTION), debian)
+	$(INSTALL) -S CHANGES.gz $(PKG_DOC_DIR)/changelog.gz
+else
 	$(INSTALL) -m 644 COPYING $(PKG_DOC_DIR)
 endif
-	$(INSTALL) -m 644 PORTING CHANGES.gz $(PKG_DOC_DIR)
+
 install-dev:
diff --git a/doc/PORTING b/doc/PORTING
index fb13b64..5b53bd5 100644
--- a/doc/PORTING
+++ b/doc/PORTING
@@ -28,12 +28,12 @@
 	environment discovered by the configure script.
 
 5. read some or all of the GNU tool chain documentation
-   gmake Table Of Contents :
+   GNU make :
        http://www.delorie.com/gnu/docs/make/make_toc.html
-   gmake Quick Reference section :
-       http://www.delorie.com/gnu/docs/make/make_120.html
-   Autoconf :
+   autoconf :
     	http://www.delorie.com/gnu/docs/autoconf/autoconf_toc.html
+   libtool :
+    	http://www.delorie.com/gnu/docs/libtool/libtool_toc.html
    gcc/g++ :
     	http://www.delorie.com/gnu/docs/gcc/gcc_toc.html
 
diff --git a/include/builddefs.in b/include/builddefs.in
index bccc33d..bd9f01f 100644
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -39,10 +39,6 @@ DEBUG = @debug_build@
 OPTIMIZER = @opt_build@
 MALLOCLIB = @malloc_lib@
 
-CPPFLAGS = -I$(TOPDIR)/include
-BUILDRULES = $(TOPDIR)/include/buildrules
-
-# General package information
 PKG_NAME = @pkg_name@
 PKG_RELEASE = @pkg_release@
 PKG_VERSION = @pkg_version@
@@ -55,8 +51,30 @@ PKG_SLIB_DIR = @pkg_slib_dir@
 PKG_INC_DIR = @pkg_inc_dir@
 PKG_MAN_DIR = @pkg_man_dir@
 PKG_DOC_DIR = @pkg_doc_dir@
-PKG_LT_VERSION = @pkg_lt_version@
-PKG_LT_CURRENT = @pkg_lt_current@
+
+CC	= @cc@
+LD	= @ld@
+AWK	= @awk@
+SED	= @sed@
+MAKE	= @make@
+ECHO	= @echo@
+LN_S	= @LN_S@
+ZIP	= @zip@
+TAR	= @tar@
+RPM	= @rpm@
+
+RPM_VERSION = @rpm_version@
+HAVE_ZIPPED_MANPAGES = @have_zipped_manpages@
+MAKEDEPEND = @makedepend@
+
+LIBTOOL	= @LIBTOOL@
+ENABLE_SHARED = @enable_shared@
+
+#
+# end configure'd section
+
+
+BUILDRULES = $(TOPDIR)/include/buildrules
 
 # LCFLAGS, LLDFLAGS, LLDLIBS, LSRCFILES and LDIRT may be specified in
 # user Makefiles. Note: LSRCFILES is anything other than Makefile, $(CFILES)
@@ -64,7 +82,7 @@ PKG_LT_CURRENT = @pkg_lt_current@
 # during the "dist" phase (packaging).
 
 CFLAGS += $(OPTIMIZER) $(DEBUG) -funsigned-char -Wall -D_GNU_SOURCE \
-	$(LCFLAGS) $(CPPFLAGS) '-DVERSION="$(PKG_VERSION)"' \
+	$(LCFLAGS) -I$(TOPDIR)/include '-DVERSION="$(PKG_VERSION)"' \
 	-D_FILE_OFFSET_BITS=64
 
 LDFLAGS = $(LLDFLAGS)
@@ -72,103 +90,63 @@ LDLIBS = $(LLDLIBS) $(MALLOCLIB)
 
 MAKEOPTS = --no-print-directory
 SRCFILES = Makefile $(HFILES) $(CFILES) $(LSRCFILES) $(LFILES) $(YFILES)
-DIRT = $(LDIRT) dep dep.bak $(OBJECTS) $(CMDTARGET) $(LIBTARGET) \
-	$(STATICLIBTARGET) *.[1-9].gz
+DIRT = $(LDIRT) dep dep.bak $(OBJECTS) $(LTCOMMAND) $(LTLIBRARY) *.[1-9].gz
 
 OBJECTS = $(ASFILES:.s=.o) \
           $(CFILES:.c=.o) \
           $(LFILES:.l=.o) \
           $(YFILES:%.y=%.tab.o)
 
-MAKE	= @make@
-CC	= @cc@
-LD	= @ld@
-AWK	= @awk@
-SED	= @sed@
 INSTALL	= $(TOPDIR)/install-sh -o root -g root
-ECHO	= @echo@
-LN_S	= @LN_S@
+
+SHELL = /bin/sh
+IMAGES_DIR = $(TOPDIR)/all-images
+DIST_DIR = $(TOPDIR)/dist
 
 CCF	= $(CC) $(CFLAGS)
 MAKEF	= $(MAKE) $(MAKEOPTS)
 CXXF	= $(CXX) $(CXXFLAGS)
 LDF	= $(LD) $(LDFLAGS)
-MAKEDEPEND  = @makedepend@
-
-ZIP	= @zip@
-TAR	= @tar@
-RPM	= @rpm@
-RPM_VERSION = @rpm_version@
-
-HAVE_ZIPPED_MANPAGES = @have_zipped_manpages@
-
-SHELL = /bin/sh
-IMAGES_DIR = $(TOPDIR)/all-images
-DIST_DIR = $(TOPDIR)/dist
 
 # For libtool.  Pieces from Automake, slightly modified.
 top_builddir = $(TOPDIR)
-LIBTOOL	= @LIBTOOL@
-LINK = $(LIBTOOL) --mode=link $(CC)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CCF)
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
+DIRT += $(LTOBJECTS) $(LTLIBRARY)
+LTLINK = $(LIBTOOL) --mode=link $(CC)
+LTEXEC = $(LIBTOOL) --mode=execute
+LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CCF) -D_REENTRANT
+LTVERSION = $(LT_CURRENT).$(LT_REVISION).$(LT_AGE)
 LTOBJECTS = $(OBJECTS:.o=.lo)
-DIRT += $(LTOBJECTS) $(LTLIBRARY) .libs/*
-ENABLE_SHARED = @enable_shared@
 ifeq ($(ENABLE_SHARED),yes)
-LDFLAGS += -rpath $(PKG_LIB_DIR) 
-LDFLAGS += -version-info $(subst .,:,$(PKG_LT_VERSION))
+LTLDFLAGS += -rpath $(PKG_LIB_DIR) 
+LTLDFLAGS += -version-info $(subst .,:,$(LTVERSION))
 endif
 LIBNAME = $(basename $(LTLIBRARY))
 
-# Remove things from the manifest that do not belong in the normal install.
-# This is cleanup after libtool --mode=install.
-LT_INSTALL_FILTER = \
-	if test "$(DIST_MANIFEST)" != ""; then \
-		perl -i -ne 'print unless /$(LIBNAME).(so|a|la)$$/' $(DIST_MANIFEST); \
-	fi
-
-
-# Remove things from the manifest that do not belong in the devel install.
-# This is cleanup after libtool --mode=install.
-LT_DEV_INSTALL_FILTER = \
-	if test "$(DIST_MANIFEST)" != ""; then \
-		perl -i -ane 'print unless $$F[-1] =~ /$(LIBNAME).so./' $(DIST_MANIFEST); \
-	fi
-
-
-# Update manifest with the symlinks that libtool made for us.
-LT_INSTALL_SYMLINKS = \
-	if test "$(DIST_MANIFEST)" != "" && \
-	   test -f $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).so.$(PKG_LT_VERSION); then \
-		$(INSTALL) -S $(LIBNAME).so.$(PKG_LT_VERSION) $(PKG_LIB_DIR)/$(LIBNAME).so.$(PKG_LT_CURRENT); \
-		$(INSTALL) -S $(LIBNAME).so.$(PKG_LT_VERSION) $(PKG_LIB_DIR)/$(LIBNAME).so; \
-	fi
-
-
-# Tell libtool to install the library.
-LT_INSTALL = \
-	@list='$(LTLIBRARY)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo $(LIBTOOL) --mode=install $(INSTALL) $$p $(DIST_ROOT)$(PKG_LIB_DIR)/$$p; \
-	    $(LIBTOOL) --mode=install $(INSTALL) $$p $(DIST_ROOT)$(PKG_LIB_DIR)/$$p; \
-	  fi; \
-	done
+ifeq ($(ENABLE_SHARED),yes)
+INSTALL_LTLIB = \
+	cd $(TOPDIR)/$(LIBNAME)/.libs; \
+	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
+	../$(INSTALL) -m 644 $(LIBNAME).so.$(LTVERSION) $(PKG_LIB_DIR); \
+	test "$(PKG_DISTRIBUTION)" = debian || \
+	../$(INSTALL) -S $(LIBNAME).so.$(LTVERSION) $(PKG_LIB_DIR)/$(LIBNAME).so.$(LT_CURRENT)
+endif
 
-SUBDIRS_MAKERULE = \
-	@for d in $(SUBDIRS) ""; do \
-	    if test -d "$$d" -a ! -z "$$d"; then \
-		$(ECHO) === $$d ===; \
-		$(MAKEF) -C $$d $@ || exit $$?; \
-	    fi; \
-	done
+ifeq ($(ENABLE_SHARED),yes)
+INSTALL_LTLIB_DEV = \
+	cd $(TOPDIR)/$(LIBNAME)/.libs; \
+	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
+	../$(INSTALL) -m 644 $(LIBNAME).a $(PKG_LIB_DIR); \
+	../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \
+	../$(INSTALL) -S $(LIBNAME).so.$(LT_CURRENT) $(PKG_LIB_DIR)/$(LIBNAME).so
+else
+INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
+endif
 
-MAN_MAKERULE = \
-    @for f in *.[12345678] ""; do \
-	if test ! -z "$$f"; then \
-	    $(ZIP) --best -c < $$f > $$f.gz; \
-	fi; \
-    done
+INSTALL_LTLIB_STATIC = \
+	cd $(TOPDIR)/$(LIBNAME)/.libs; \
+	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
+	../$(INSTALL) -m 644 $(LIBNAME).a $(PKG_LIB_DIR)
 
 INSTALL_MAN = \
     @for d in $(MAN_PAGES); do \
@@ -193,6 +171,21 @@ INSTALL_MAN = \
 	done; \
     done
 
+SUBDIRS_MAKERULE = \
+	@for d in $(SUBDIRS) ""; do \
+	    if test -d "$$d" -a ! -z "$$d"; then \
+		$(ECHO) === $$d ===; \
+		$(MAKEF) -C $$d $@ || exit $$?; \
+	    fi; \
+	done
+
+MAN_MAKERULE = \
+    @for f in *.[12345678] ""; do \
+	if test ! -z "$$f"; then \
+	    $(ZIP) --best -c < $$f > $$f.gz; \
+	fi; \
+    done
+
 DIST_MAKERULE = \
 	$(MAKEF) -C build dist
 
diff --git a/include/buildrules b/include/buildrules
index d3f71bf..ecf235e 100644
--- a/include/buildrules
+++ b/include/buildrules
@@ -26,52 +26,39 @@ _BUILDRULES_INCLUDED_ = 1
 
 include $(TOPDIR)/include/builddefs
 
+clean clobber : $(SUBDIRS)
+	rm -f $(DIRT)
+	@rm -fr .libs
+	$(SUBDIRS_MAKERULE)
+
+# Never blow away subdirs
+ifdef SUBDIRS
+.PRECIOUS: $(SUBDIRS)
+$(SUBDIRS):
+	$(SUBDIRS_MAKERULE)
+endif
+
 #
 # Standard targets
 #
-ifdef CMDTARGET
-$(CMDTARGET) : $(SUBDIRS) $(OBJECTS)
-	$(CCF) -o $(CMDTARGET) $(LDFLAGS) $(OBJECTS) $(LDLIBS) 
-$(CMDTARGET).static : $(SUBDIRS) $(OBJECTS)
-	$(CCF) -static -o $(CMDTARGET).static $(LDFLAGS) $(OBJECTS) $(LDLIBS) 
-endif
-
-ifdef LIBTARGET
-$(LIBTARGET) : $(SUBDIRS) $(OBJECTS)
-	$(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname,$(LIBTARGET) -o $(LIBTARGET) $(OBJECTS) $(LDLIBS)
-endif
 
-ifdef STATICLIBTARGET
-$(STATICLIBTARGET) : $(SUBDIRS) $(OBJECTS)
-	$(AR) crf $(STATICLIBTARGET) $?
+ifdef LTCOMMAND
+$(LTCOMMAND) : $(SUBDIRS) $(OBJECTS) $(LTDEPENDENCIES)
+	$(LTLINK) -o $@ $(LDFLAGS) $(OBJECTS) $(LDLIBS)
 endif
 
-# For libtool.  Pieces from Automake, slightly modified.
 ifdef LTLIBRARY
-
 $(LTLIBRARY) : $(SUBDIRS) $(LTOBJECTS)
-	$(LINK) $(LDFLAGS) -o $(LTLIBRARY) $(LTOBJECTS) $(LDLIBS)
+	$(LTLINK) $(LTLDFLAGS) -o $(LTLIBRARY) $(LTOBJECTS) $(LDLIBS)
 
 %.lo: %.c
 	$(LTCOMPILE) -c $<
-
-endif # LTLIBRARY
-
-clean clobber : $(SUBDIRS)
-	rm -f $(DIRT)
-	$(SUBDIRS_MAKERULE)
-
-# Never blow away subdirs
-ifdef SUBDIRS
-.PRECIOUS: $(SUBDIRS)
-$(SUBDIRS):
-	$(SUBDIRS_MAKERULE)
 endif
 
 source :
 	$(SOURCE_MAKERULE)
 
-endif
+endif # _BUILDRULES_INCLUDED_
 
 $(_FORCE):
 
diff --git a/install-sh b/install-sh
index e7daca3..395497a 100755
--- a/install-sh
+++ b/install-sh
@@ -203,10 +203,7 @@ else
 	# second usage
 	#
 	f=$1
-	case "$2" in
-	    $DIST_ROOT/*)	dir=$2 ;;
-	    *)			dir=$DIST_ROOT/$2 ;;
-	esac
+	dir=$DIST_ROOT/$2
 	if $Dflag
 	then
 	    mkdir -p `dirname $dir`
diff --git a/libdm/Makefile b/libdm/Makefile
index 3a8c22f..bbd1521 100644
--- a/libdm/Makefile
+++ b/libdm/Makefile
@@ -35,24 +35,21 @@ include $(TOPDIR)/include/builddefs
 
 LTLIBRARY = libdm.la
 LDLIBS = -lhandle
+LT_CURRENT = 0
+LT_REVISION = 0
+LT_AGE = 0
 
 HFILES = dmapi_lib.h
 CFILES = dmapi_lib.c dm_attr.c dm_bulkattr.c dm_config.c dm_dmattr.c \
 	 dm_event.c dm_handle.c dm_handle2path.c dm_hole.c dm_mountinfo.c \
 	 dm_region.c dm_right.c dm_rdwr.c dm_session.c
-LCFLAGS = -D_REENTRANT
 
 default: $(LTLIBRARY)
 
 include $(BUILDRULES)
 
-install: install-libLTLIBRARY
-	$(LT_INSTALL_FILTER)
+install: default
+	$(INSTALL_LTLIB)
 
-install-dev: install-libLTLIBRARY
-	$(LT_DEV_INSTALL_FILTER)
-
-install-libLTLIBRARY: $(LTLIBRARY)
-	$(INSTALL) -m 755 -d $(PKG_LIB_DIR)
-	$(LT_INSTALL)
-	$(LT_INSTALL_SYMLINKS)
+install-dev: default
+	$(INSTALL_LTLIB_DEV)