Aurelien Jarno <aure...@debian.org> (14/05/2009): > > > -Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, pciutils, > > > usbutils, udev (>= 0.125), dbus (>= 0.61), lsb-base (>= 3.2-14), hal-info > > > (>= 20070402), pm-utils, mount (>= 2.13), policykit (>= 0.7), consolekit > > > (>= 0.3), acl > > > +Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, pciutils, > > > usbutils, udev (>= 0.125) [!kfreebsd-amd64 !kfreebsd-i386], dbus (>= > > > 0.61), lsb-base (>= 3.2-14), hal-info (>= 20070402), pm-utils > > > [!kfreebsd-amd64 !kfreebsd-i386], mount (>= 2.13) [!kfreebsd-amd64 > > > !kfreebsd-i386], freebsd-utils [kfreebsd-amd64 kfreebsd-i386], policykit > > > (>= 0.7), consolekit (>= 0.3), acl > > > > Why has pm-utils be removed on kfreebsd? > > pm-utils is not installable on GNU/kFreeBSD as it is not installable > (depends on console-tools), and also this package looks very GNU/Linux > specific.
I didn't investigate this any further, trusting you. > > So this is library is more or less private to HAL. I'm wondering, if > > this lib shouldn't rather be moved to /usr/lib/hal (and shipped as > > part of the hal package) or libhald-freebsd-probe (in > > hald/freebsd/libprobe/Makefile.am) is made a noinst ltlib. The > > latter would probably be my preference. > > > > I'd really prefer if we don't need a separate binary package. > > Ok, I'll come back with another patch. So, I moved it from lib_LTLIBRARIES to noinst_LTLIBRARIES, and it looks like that does the trick. This way, the convenience library is only used at build time, and no longer installed, so no additional package. Minimal changes extracted manually from an autoreconf run, I've left the hunk related to the automake version bump just for reference. I also compared “sudo lshal”'s output with the previous patch and with that one, it's identical, so I guess we're fine. > > > --- hal-0.5.12~git20090406.46dc48.orig/debian/hal.install.kfreebsd-amd64 > > > +++ hal-0.5.12~git20090406.46dc48/debian/hal.install.kfreebsd-amd64 > > > @@ -0,0 +1,9 @@ > > > +debian/tmp/etc/ > > > +debian/tmp/usr/bin/ > > > +debian/tmp/usr/sbin/ > > > +debian/tmp/sbin/umount.hal usr/sbin > > > +debian/tmp/usr/lib/hal/ > > > +debian/tmp/usr/share/hal/fdi/ > > > +debian/tmp/usr/share/PolicyKit/ > > > +debian/preferences.fdi etc/hal/fdi/policy > > > +debian/debian-storage-policy-ignore-fixed-crypto-drives.fdi > > > usr/share/hal/fdi/policy/10osvendor > > > only in patch2: > > > unchanged: > > > --- hal-0.5.12~git20090406.46dc48.orig/debian/hal.install.kfreebsd-i386 > > > +++ hal-0.5.12~git20090406.46dc48/debian/hal.install.kfreebsd-i386 > > > @@ -0,0 +1,9 @@ > > > +debian/tmp/etc/ > > > +debian/tmp/usr/bin/ > > > +debian/tmp/usr/sbin/ > > > +debian/tmp/sbin/umount.hal usr/sbin > > > +debian/tmp/usr/lib/hal/ > > > +debian/tmp/usr/share/hal/fdi/ > > > +debian/tmp/usr/share/PolicyKit/ > > > +debian/preferences.fdi etc/hal/fdi/policy > > > +debian/debian-storage-policy-ignore-fixed-crypto-drives.fdi > > > usr/share/hal/fdi/policy/10osvendor > > > > This is because the udev rules files are not installed on freebsd, > > right? I'd somehow prefer if we wouldn't have to maintain three > > separate files and keep them in sync. Not sure if this easily doable > > though. > > > > Yes, they are udev rules, useless on GNU/kFreeBSD and not even > installed by 'make install'. > > One solution is to not install those files from but conditionally from > debian/rules. I don't really like that, especially if the kfreebsd > version of the package also have specific files (the probe library). Tweaked debian/rules and .install file given that: 1. maintainer expressed the wish for a single file if possible, plus conditional stuff in debian/rules, I'm adding the udev rules only on Linux architectures. I first thought of removing them on non-Linux architectures, but as you said, they're not installed, so keeping the current .install file would mean a failing dh_install. That's why I'm doing it the other way round. 2. no more additional probe library. >From a kfreebsd-* point of view: we're still lacking libvolume-id-dev, so uploading the current sid package with the attached patch will lead to an FTBFS again (we're using a “standalone” unreleased libvolume-id library from debian-ports.org on porter boxes, which isn't meant to be uploaded to debian, as we discussed); but we should now be ready for when libblkid is used instead. Mraw, KiBi.
diff -u hal-0.5.12~git20090406.46dc48/debian/hal.install hal-0.5.12~git20090406.46dc48/debian/hal.install --- hal-0.5.12~git20090406.46dc48/debian/hal.install +++ hal-0.5.12~git20090406.46dc48/debian/hal.install @@ -6,5 +6,6 @@ debian/tmp/usr/share/hal/fdi/ debian/tmp/usr/share/PolicyKit/ -debian/tmp/lib/udev/rules.d/ +# Now conditionally installed from debian/rules: +# debian/tmp/lib/udev/rules.d/ debian/preferences.fdi etc/hal/fdi/policy debian/debian-storage-policy-ignore-fixed-crypto-drives.fdi usr/share/hal/fdi/policy/10osvendor diff -u hal-0.5.12~git20090406.46dc48/debian/control hal-0.5.12~git20090406.46dc48/debian/control --- hal-0.5.12~git20090406.46dc48/debian/control +++ hal-0.5.12~git20090406.46dc48/debian/control @@ -32,7 +32,7 @@ Package: hal Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, pciutils, usbutils, udev (>= 0.125), dbus (>= 0.61), lsb-base (>= 3.2-14), hal-info (>= 20070402), pm-utils, mount (>= 2.13), policykit (>= 0.7), consolekit (>= 0.3), acl +Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, pciutils, usbutils, udev (>= 0.125) [!kfreebsd-amd64 !kfreebsd-i386], dbus (>= 0.61), lsb-base (>= 3.2-14), hal-info (>= 20070402), pm-utils [!kfreebsd-amd64 !kfreebsd-i386], mount (>= 2.13) [!kfreebsd-amd64 !kfreebsd-i386], freebsd-utils [kfreebsd-amd64 kfreebsd-i386], policykit (>= 0.7), consolekit (>= 0.3), acl Recommends: eject, libsmbios-bin [amd64 i386 lpia] Suggests: gnome-device-manager Description: Hardware Abstraction Layer diff -u hal-0.5.12~git20090406.46dc48/debian/hal.init hal-0.5.12~git20090406.46dc48/debian/hal.init --- hal-0.5.12~git20090406.46dc48/debian/hal.init +++ hal-0.5.12~git20090406.46dc48/debian/hal.init @@ -48,7 +48,7 @@ case "$1" in start) - if [ ! -d /proc/sys/fs/inotify ]; then + if [ ! -d /proc/sys/fs/inotify ] && [ `uname` = "Linux" ]; then log_failure_msg "Can't start $DESC - enable inotify support in your kernel" exit 0 fi @@ -57,7 +57,7 @@ exit 0 fi - if [ ! -d /sys/kernel ]; then + if [ ! -d /sys/kernel ] && [ `uname` = "Linux" ]; then log_failure_msg "Can't start $DESC - sysfs not mounted on /sys" exit 0 fi diff -u hal-0.5.12~git20090406.46dc48/debian/changelog hal-0.5.12~git20090406.46dc48/debian/changelog --- hal-0.5.12~git20090406.46dc48/debian/changelog +++ hal-0.5.12~git20090406.46dc48/debian/changelog @@ -1,3 +1,10 @@ +hal (0.5.12~git20090406.46dc48-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Add support for GNU/kFreeBSD. + + -- Cyril Brulebois <k...@debian.org> Mon, 06 Jul 2009 01:10:22 +0200 + hal (0.5.12~git20090406.46dc48-2) unstable; urgency=low * debian/hal.postinst diff -u hal-0.5.12~git20090406.46dc48/debian/rules hal-0.5.12~git20090406.46dc48/debian/rules --- hal-0.5.12~git20090406.46dc48/debian/rules +++ hal-0.5.12~git20090406.46dc48/debian/rules @@ -32,0 +33,6 @@ +binary-install/hal:: + # Only install udev rules on Linux architectures. The + # directory doesn't even exist on e.g. GNU/kFreeBSD +ifeq ($(DEB_HOST_ARCH_OS),linux) + dh_install -phal debian/tmp/lib/udev/rules.d/ +endif diff -u hal-0.5.12~git20090406.46dc48/debian/patches/series hal-0.5.12~git20090406.46dc48/debian/patches/series --- hal-0.5.12~git20090406.46dc48/debian/patches/series +++ hal-0.5.12~git20090406.46dc48/debian/patches/series @@ -4,0 +5 @@ +50_kfreebsd.patch only in patch2: unchanged: --- hal-0.5.12~git20090406.46dc48.orig/debian/patches/50_kfreebsd.patch +++ hal-0.5.12~git20090406.46dc48/debian/patches/50_kfreebsd.patch @@ -0,0 +1,442 @@ +--- a/configure ++++ b/configure +@@ -19138,7 +19138,7 @@ + *-*-solaris*) + HALD_BACKEND="solaris" + ;; +- *-*-freebsd*) ++ *-*-freebsd* | *-*-kfreebsd*-gnu) + HALD_BACKEND="freebsd" + ;; + *-linux*) +--- a/configure.in ++++ b/configure.in +@@ -488,7 +488,7 @@ + *-*-solaris*) + HALD_BACKEND="solaris" + ;; +- *-*-freebsd*) ++ *-*-freebsd* | *-*-kfreebsd*-gnu) + HALD_BACKEND="freebsd" + ;; + *-linux*) +--- a/hald/freebsd/hf-storage.c ++++ b/hald/freebsd/hf-storage.c +@@ -644,7 +644,6 @@ + hf_storage_device_enable (HalDevice *device) + { + g_return_if_fail(HAL_IS_DEVICE(device)); +- g_return_if_fail(devname != NULL); + + hal_device_property_set_string(device, "storage.bus", "platform"); + hal_device_property_set_string(device, "storage.drive_type", "disk"); +--- a/hald/freebsd/addons/addon-storage.c ++++ b/hald/freebsd/addons/addon-storage.c +@@ -181,10 +181,12 @@ + static void + update_proc_title (const char *device, boolean polling_enabled) + { ++#ifndef __GLIBC__ + if (polling_enabled) + setproctitle("%s", device); + else + setproctitle("no polling on %s because it is explicitly disabled", device); ++#endif + } + + static DBusHandlerResult +--- a/hald/freebsd/libprobe/hfp-cdrom.h ++++ b/hald/freebsd/libprobe/hfp-cdrom.h +@@ -28,7 +28,7 @@ + # include <config.h> + #endif + +-#include <sys/types.h> ++#include <stdint.h> + + #include "hfp.h" + +@@ -53,8 +53,8 @@ + typedef struct + { + /* mode page data header */ +- u_int16_t data_length; +- u_int8_t medium_type; ++ uint16_t data_length; ++ uint8_t medium_type; + #define HFP_CDROM_MST_TYPE_MASK_LOW 0x0f + #define HFP_CDROM_MST_FMT_NONE 0x00 + #define HFP_CDROM_MST_DATA_120 0x01 +@@ -75,17 +75,17 @@ + #define HFP_CDROM_MST_DOOR_OPEN 0x71 + #define HFP_CDROM_MST_FMT_ERROR 0x72 + +- u_int8_t dev_spec; +- u_int16_t unused; +- u_int16_t blk_desc_len; ++ uint8_t dev_spec; ++ uint16_t unused; ++ uint16_t blk_desc_len; + + /* capabilities page */ +- u_int8_t page_code; ++ uint8_t page_code; + #define HFP_CDROM_CAP_PAGE 0x2a + +- u_int8_t param_len; ++ uint8_t param_len; + +- u_int16_t media; ++ uint16_t media; + #define HFP_CDROM_MST_READ_CDR 0x0001 + #define HFP_CDROM_MST_READ_CDRW 0x0002 + #define HFP_CDROM_MST_READ_PACKET 0x0004 +@@ -98,7 +98,7 @@ + #define HFP_CDROM_MST_WRITE_DVDR 0x1000 + #define HFP_CDROM_MST_WRITE_DVDRAM 0x2000 + +- u_int16_t capabilities; ++ uint16_t capabilities; + #define HFP_CDROM_MSTAUDIO_PLAY 0x0001 + #define HFP_CDROM_MST_COMPOSITE 0x0002 + #define HFP_CDROM_MST_AUDIO_P1 0x0004 +@@ -115,7 +115,7 @@ + #define HFP_CDROM_MST_ISRC 0x2000 + #define HFP_CDROM_MST_UPC 0x4000 + +- u_int8_t mechanism; ++ uint8_t mechanism; + #define HFP_CDROM_MST_LOCKABLE 0x01 + #define HFP_CDROM_MST_LOCKED 0x02 + #define HFP_CDROM_MST_PREVENT 0x04 +@@ -131,18 +131,18 @@ + #define HFP_CDROM_MST_SEP_VOL 0x01 + #define HFP_CDROM_MST_SEP_MUTE 0x02 + +- u_int16_t max_read_speed; /* max raw data rate in bytes/1000 */ +- u_int16_t max_vol_levels; /* number of discrete volume levels */ +- u_int16_t buf_size; /* internal buffer size in bytes/1024 */ +- u_int16_t cur_read_speed; /* current data rate in bytes/1000 */ +- +- u_int8_t reserved3; +- u_int8_t misc; +- +- u_int16_t max_write_speed; /* max raw data rate in bytes/1000 */ +- u_int16_t cur_write_speed; /* current data rate in bytes/1000 */ +- u_int16_t copy_protect_rev; +- u_int16_t reserved4; ++ uint16_t max_read_speed; /* max raw data rate in bytes/1000 */ ++ uint16_t max_vol_levels; /* number of discrete volume levels */ ++ uint16_t buf_size; /* internal buffer size in bytes/1024 */ ++ uint16_t cur_read_speed; /* current data rate in bytes/1000 */ ++ ++ uint8_t reserved3; ++ uint8_t misc; ++ ++ uint16_t max_write_speed; /* max raw data rate in bytes/1000 */ ++ uint16_t cur_write_speed; /* current data rate in bytes/1000 */ ++ uint16_t copy_protect_rev; ++ uint16_t reserved4; + } HFPCDROMCapabilities; + + HFPCDROM *hfp_cdrom_new (const char *path, const char *parent); +--- a/hald/freebsd/probing/probe-volume.c ++++ b/hald/freebsd/probing/probe-volume.c +@@ -59,7 +59,7 @@ + }; + #define ISO_PATH_TABLE_ENTRY_SIZE 8 + +-#if __FreeBSD_version < 600101 ++#if (__FreeBSD_version < 600101) && (__FreeBSD_kernel_version < 600101) + static uint32_t + isonum_731(unsigned char *p) + { +@@ -342,7 +342,9 @@ + goto end; + + /* give a meaningful process title for ps(1) */ ++#ifndef __GLIBC__ + setproctitle("%s", device_file); ++#endif + + has_children = hfp_getenv_bool("HF_HAS_CHILDREN"); + is_swap = hfp_getenv_bool("HF_IS_SWAP"); +only in patch2: +unchanged: +--- a/hald/freebsd/probing/probe-scsi.c ++++ b/hald/freebsd/probing/probe-scsi.c +@@ -48,7 +48,9 @@ + goto end; + + /* give a meaningful process title for ps(1) */ ++#ifndef __GLIBC__ + setproctitle("%s", device_file); ++#endif + + /* cam_open_device() fails unless we use O_RDWR */ + cam = cam_open_device(device_file, O_RDWR); +--- a/hald/freebsd/probing/probe-hiddev.c ++++ b/hald/freebsd/probing/probe-hiddev.c +@@ -63,8 +63,9 @@ + goto end; + + /* give a meaningful process title for ps(1) */ ++#ifndef __GLIBC__ + setproctitle("%s", device_file); +- ++#endif + if (ioctl(fd, USB_GET_REPORT_ID, &report_id) < 0) + goto end; + +--- a/hald/freebsd/probing/probe-storage.c ++++ b/hald/freebsd/probing/probe-storage.c +@@ -192,7 +192,9 @@ + goto end; + + /* give a meaningful process title for ps(1) */ ++#ifndef __GLIBC__ + setproctitle("%s", device_file); ++#endif + + has_children = hfp_getenv_bool("HF_HAS_CHILDREN"); + only_check_for_media = hfp_getenv_bool("HF_ONLY_CHECK_FOR_MEDIA"); +only in patch2: +unchanged: +--- a/tools/hal-system-power-pmu.c ++++ b/tools/hal-system-power-pmu.c +@@ -53,7 +53,7 @@ + static int + pmac_sleep (void) + { +-#ifdef __FreeBSD__ ++#if defined (__FreeBSD__) || defined(__FreeBSD_kernel__) + return FALSE; /* FIXME implement */ + #elif sun + return FALSE; /* FIXME implement */ +@@ -90,7 +90,7 @@ + static int + pmac_get_lcd_brightness (int *val) + { +-#ifdef __FreeBSD__ ++#if defined (__FreeBSD__) || defined(__FreeBSD_kernel__) + return FALSE; /* FIXME implement */ + #elif sun + return FALSE; /* FIXME implement */ +@@ -127,7 +127,7 @@ + static int + pmac_set_lcd_brightness (int val) + { +-#ifdef __FreeBSD__ ++#if defined (__FreeBSD__) || defined(__FreeBSD_kernel__) + return FALSE; /* FIXME implement */ + #elif sun + return FALSE; /* FIXME implement */ +only in patch2: +unchanged: +--- a/tools/hal-system-sonypic.c ++++ b/tools/hal-system-sonypic.c +@@ -63,7 +63,7 @@ + static int + sonypi_get_lcd_brightness (__u8 *val) + { +-#ifdef __FreeBSD__ ++#if defined (__FreeBSD__) || defined(__FreeBSD_kernel__) + return FALSE; /* FIXME implement */ + #elif sun + return FALSE; /* FIXME implement */ +@@ -163,7 +163,7 @@ + static int + sonypi_set_lcd_brightness (__u8 val) + { +-#ifdef __FreeBSD__ ++#if defined (__FreeBSD__) || defined(__FreeBSD_kernel__) + return FALSE; /* FIXME implement */ + #elif sun + return FALSE; /* FIXME implement */ +@@ -195,7 +195,7 @@ + static int + sonypi_set_bluetooth_power (int val) + { +-#ifdef __FreeBSD__ ++#if defined (__FreeBSD__) || defined(__FreeBSD_kernel__) + return FALSE; /* FIXME implement */ + #elif sun + return FALSE; /* FIXME implement */ +--- a/hald/freebsd/hf-pci.c ++++ b/hald/freebsd/hf-pci.c +@@ -27,7 +27,7 @@ + + #include <stdio.h> + #include <string.h> +-#include <bitstring.h> ++#include <sys/bitstring.h> + #include <errno.h> + #include <fcntl.h> + #include <unistd.h> +--- a/hald/freebsd/libprobe/Makefile.am ++++ b/hald/freebsd/libprobe/Makefile.am +@@ -8,7 +8,7 @@ AM_CPPFLAGS = \ + @DBUS_CFLAGS@ + + if HALD_COMPILE_FREEBSD +-lib_LTLIBRARIES = libhald_freebsd_probe.la ++noinst_LTLIBRARIES = libhald_freebsd_probe.la + endif + + libhald_freebsd_probe_la_SOURCES = \ +--- a/hald/freebsd/libprobe/Makefile.in ++++ b/hald/freebsd/libprobe/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -42,15 +42,7 @@ am__configure_deps = $(am__aclocal_m4_de + mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(libdir)" +-libLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(lib_LTLIBRARIES) ++LTLIBRARIES = $(noinst_LTLIBRARIES) + libhald_freebsd_probe_la_LIBADD = + am_libhald_freebsd_probe_la_OBJECTS = hfp.lo hfp-cdrom.lo + libhald_freebsd_probe_la_OBJECTS = \ +@@ -58,8 +50,7 @@ libhald_freebsd_probe_la_OBJECTS = \ + libhald_freebsd_probe_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libhald_freebsd_probe_la_LDFLAGS) $(LDFLAGS) -o $@ +...@hald_compile_freebsd_true@am_libhald_freebsd_probe_la_rpath = -rpath \ +...@hald_compile_freebsd_true@ $(libdir) +...@hald_compile_freebsd_true@am_libhald_freebsd_probe_la_rpath = + DEFAULT_INCLUDES = -...@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +@@ -244,7 +235,7 @@ AM_CPPFLAGS = \ + -I$(top_srcdir) -I.. \ + @DBUS_CFLAGS@ + +...@hald_compile_freebsd_true@lib_LTLIBRARIES = libhald_freebsd_probe.la +...@hald_compile_freebsd_true@noinst_LTLIBRARIES = libhald_freebsd_probe.la + libhald_freebsd_probe_la_SOURCES = \ + hfp.c \ + hfp.h \ +@@ -260,8 +251,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -285,28 +276,10 @@ $(top_srcdir)/configure: @MAINTAINER_MOD + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-install-libLTLIBRARIES: $(lib_LTLIBRARIES) +- @$(NORMAL_INSTALL) +- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" +- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ +- if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ +- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ +- else :; fi; \ +- done +- +-uninstall-libLTLIBRARIES: +- @$(NORMAL_UNINSTALL) +- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ +- p=$(am__strip_dir) \ +- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ +- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ +- done + +-clean-libLTLIBRARIES: +- -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) +- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ++clean-noinstLTLIBRARIES: ++ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) ++ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ +@@ -356,7 +329,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -428,9 +401,6 @@ check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) + installdirs: +- for dir in "$(DESTDIR)$(libdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -457,7 +427,7 @@ maintainer-clean-generic: + @echo "it deletes files that may require special tools to rebuild." + clean: clean-am + +-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ ++clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ + mostlyclean-am + + distclean: distclean-am +@@ -480,7 +450,7 @@ install-data-am: + + install-dvi: install-dvi-am + +-install-exec-am: install-libLTLIBRARIES ++install-exec-am: + + install-html: install-html-am + +@@ -512,23 +482,22 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-libLTLIBRARIES ++uninstall-am: + + .MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ +- clean-libLTLIBRARIES clean-libtool ctags distclean \ ++ clean-libtool clean-noinstLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ +- install-html-am install-info install-info-am \ +- install-libLTLIBRARIES install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-compile \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- tags uninstall uninstall-am uninstall-libLTLIBRARIES ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ ++ install-strip installcheck installcheck-am installdirs \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ ++ pdf pdf-am ps ps-am tags uninstall uninstall-am + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded.