diff -urN xfsprogs-2.6.13.orig/copy/Makefile xfsprogs-2.6.13/copy/Makefile --- xfsprogs-2.6.13.orig/copy/Makefile 2004-04-05 07:12:54 +0400 +++ xfsprogs-2.6.13/copy/Makefile 2006-01-15 21:00:30 +0300 @@ -39,7 +39,6 @@ LLDLIBS = $(LIBXFS) $(LIBUUID) $(LIBPTHREAD) LTDEPENDENCIES = $(LIBXFS) -LLDFLAGS = -static default: $(LTCOMMAND) diff -urN xfsprogs-2.6.13.orig/db/Makefile xfsprogs-2.6.13/db/Makefile --- xfsprogs-2.6.13.orig/db/Makefile 2004-04-05 07:12:54 +0400 +++ xfsprogs-2.6.13/db/Makefile 2006-01-15 21:00:30 +0300 @@ -45,7 +45,6 @@ LSRCFILES = xfs_admin.sh xfs_check.sh xfs_ncheck.sh LLDLIBS = $(LIBXFS) $(LIBXLOG) $(LIBUUID) LTDEPENDENCIES = $(LIBXFS) $(LIBXLOG) -LLDFLAGS += -static ifeq ($(ENABLE_READLINE),yes) LLDLIBS += $(LIBREADLINE) diff -urN xfsprogs-2.6.13.orig/fsck/Makefile xfsprogs-2.6.13/fsck/Makefile --- xfsprogs-2.6.13.orig/fsck/Makefile 2004-04-05 07:12:56 +0400 +++ xfsprogs-2.6.13/fsck/Makefile 2006-01-15 21:00:30 +0300 @@ -36,7 +36,6 @@ LTCOMMAND = fsck.xfs CFILES = xfs_fsck.c LCFLAGS = -s -O3 -LLDFLAGS += -static default: $(LTCOMMAND) diff -urN xfsprogs-2.6.13.orig/growfs/Makefile xfsprogs-2.6.13/growfs/Makefile --- xfsprogs-2.6.13.orig/growfs/Makefile 2004-04-05 07:12:56 +0400 +++ xfsprogs-2.6.13/growfs/Makefile 2006-01-15 21:00:30 +0300 @@ -45,7 +45,6 @@ LLDLIBS = $(LIBXFS) $(LIBUUID) LTDEPENDENCIES = $(LIBXFS) -LLDFLAGS = -static LSRCFILES = xfs_info.sh default: $(LTCOMMAND) diff -urN xfsprogs-2.6.13.orig/include/buildmacros xfsprogs-2.6.13/include/buildmacros --- xfsprogs-2.6.13.orig/include/buildmacros 2004-04-05 07:12:56 +0400 +++ xfsprogs-2.6.13/include/buildmacros 2006-01-15 21:00:52 +0300 @@ -100,10 +100,7 @@ ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_DEVLIB_DIR); \ ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \ ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ - ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \ - ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \ - ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \ - ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so + ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); else INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC) endif diff -urN xfsprogs-2.6.13.orig/libdisk/Makefile xfsprogs-2.6.13/libdisk/Makefile --- xfsprogs-2.6.13.orig/libdisk/Makefile 2004-05-01 07:34:08 +0400 +++ xfsprogs-2.6.13/libdisk/Makefile 2006-01-15 21:00:30 +0300 @@ -53,6 +53,8 @@ include $(BUILDRULES) install: default + $(INSTALL_LTLIB) install-dev: default + $(INSTALL_LTLIB_DEV) $(INSTALL_LTLIB_STATIC) diff -urN xfsprogs-2.6.13.orig/libhandle/Makefile xfsprogs-2.6.13/libhandle/Makefile --- xfsprogs-2.6.13.orig/libhandle/Makefile 2004-04-05 07:12:57 +0400 +++ xfsprogs-2.6.13/libhandle/Makefile 2006-01-15 21:00:30 +0300 @@ -49,3 +49,4 @@ install-dev: default $(INSTALL_LTLIB_DEV) + $(INSTALL_LTLIB_STATIC) diff -urN xfsprogs-2.6.13.orig/libxfs/Makefile xfsprogs-2.6.13/libxfs/Makefile --- xfsprogs-2.6.13.orig/libxfs/Makefile 2004-04-05 07:12:57 +0400 +++ xfsprogs-2.6.13/libxfs/Makefile 2006-01-15 21:00:30 +0300 @@ -68,6 +68,8 @@ include $(BUILDRULES) install: default + $(INSTALL_LTLIB) install-dev: default + $(INSTALL_LTLIB_DEV) $(INSTALL_LTLIB_STATIC) diff -urN xfsprogs-2.6.13.orig/libxlog/Makefile xfsprogs-2.6.13/libxlog/Makefile --- xfsprogs-2.6.13.orig/libxlog/Makefile 2004-04-05 07:12:58 +0400 +++ xfsprogs-2.6.13/libxlog/Makefile 2006-01-15 21:00:30 +0300 @@ -48,6 +48,8 @@ include $(BUILDRULES) install: default + $(INSTALL_LTLIB) install-dev: default + $(INSTALL_LTLIB_DEV) $(INSTALL_LTLIB_STATIC) diff -urN xfsprogs-2.6.13.orig/logprint/Makefile xfsprogs-2.6.13/logprint/Makefile --- xfsprogs-2.6.13.orig/logprint/Makefile 2004-05-07 08:11:39 +0400 +++ xfsprogs-2.6.13/logprint/Makefile 2006-01-15 21:00:30 +0300 @@ -42,7 +42,6 @@ LLDLIBS = $(LIBXFS) $(LIBXLOG) $(LIBUUID) LTDEPENDENCIES = $(LIBXFS) $(LIBXLOG) -LLDFLAGS = -static default: $(LTCOMMAND) diff -urN xfsprogs-2.6.13.orig/mkfile/Makefile xfsprogs-2.6.13/mkfile/Makefile --- xfsprogs-2.6.13.orig/mkfile/Makefile 2004-04-05 07:12:59 +0400 +++ xfsprogs-2.6.13/mkfile/Makefile 2006-01-15 21:00:30 +0300 @@ -35,7 +35,6 @@ LTCOMMAND = xfs_mkfile CFILES = xfs_mkfile.c -LLDFLAGS += -static default: $(LTCOMMAND) diff -urN xfsprogs-2.6.13.orig/mkfs/Makefile xfsprogs-2.6.13/mkfs/Makefile --- xfsprogs-2.6.13.orig/mkfs/Makefile 2004-04-05 07:12:59 +0400 +++ xfsprogs-2.6.13/mkfs/Makefile 2006-01-15 21:00:30 +0300 @@ -42,7 +42,6 @@ LLDLIBS = $(LIBXFS) $(LIBUUID) $(LIBDISK) LTDEPENDENCIES = $(LIBXFS) $(LIBDISK) -LLDFLAGS = -static MAXTRLIBS = $(LIBXFS) $(LIBUUID) $(PLDLIBS) LSRCFILES = $(MAXTRRES).c $(FSTYP).c diff -urN xfsprogs-2.6.13.orig/repair/Makefile xfsprogs-2.6.13/repair/Makefile --- xfsprogs-2.6.13.orig/repair/Makefile 2004-04-05 07:13:00 +0400 +++ xfsprogs-2.6.13/repair/Makefile 2006-01-15 21:00:30 +0300 @@ -47,7 +47,6 @@ LLDLIBS = $(LIBXFS) $(LIBXLOG) $(LIBUUID) LTDEPENDENCIES = $(LIBXFS) $(LIBXLOG) -LLDFLAGS = -static default: $(LTCOMMAND) diff -urN xfsprogs-2.6.13.orig/rtcp/Makefile xfsprogs-2.6.13/rtcp/Makefile --- xfsprogs-2.6.13.orig/rtcp/Makefile 2004-04-05 07:13:01 +0400 +++ xfsprogs-2.6.13/rtcp/Makefile 2006-01-15 21:00:30 +0300 @@ -35,7 +35,6 @@ LTCOMMAND = xfs_rtcp CFILES = xfs_rtcp.c -LLDFLAGS = -static default: $(LTCOMMAND)