diff options
Diffstat (limited to 'sysutils/hal/files/patch-hald_freebsd_probing_Makefile.in')
| -rw-r--r-- | sysutils/hal/files/patch-hald_freebsd_probing_Makefile.in | 170 |
1 files changed, 0 insertions, 170 deletions
diff --git a/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.in b/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.in deleted file mode 100644 index 4a8ea2f05..000000000 --- a/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.in +++ /dev/null @@ -1,170 +0,0 @@ ---- hald/freebsd/probing/Makefile.in.orig 2009-07-16 22:17:53.000000000 -0400 -+++ hald/freebsd/probing/Makefile.in 2009-07-17 02:32:09.000000000 -0400 -@@ -34,10 +34,16 @@ build_triplet = @build@ - host_triplet = @host@ - @HALD_COMPILE_FREEBSD_TRUE@libexec_PROGRAMS = \ - @HALD_COMPILE_FREEBSD_TRUE@ hald-probe-hiddev$(EXEEXT) \ -+@HALD_COMPILE_FREEBSD_TRUE@ hald-probe-mouse$(EXEEXT) \ - @HALD_COMPILE_FREEBSD_TRUE@ hald-probe-scsi$(EXEEXT) \ - @HALD_COMPILE_FREEBSD_TRUE@ hald-probe-smbios$(EXEEXT) \ - @HALD_COMPILE_FREEBSD_TRUE@ hald-probe-storage$(EXEEXT) \ --@HALD_COMPILE_FREEBSD_TRUE@ hald-probe-volume$(EXEEXT) -+@HALD_COMPILE_FREEBSD_TRUE@ hald-probe-volume$(EXEEXT) \ -+@HALD_COMPILE_FREEBSD_TRUE@ $(am__EXEEXT_1) -+@HALD_COMPILE_FREEBSD_TRUE@@HAVE_LIBUSB20_TRUE@am__append_1 = \ -+@HALD_COMPILE_FREEBSD_TRUE@@HAVE_LIBUSB20_TRUE@ hald-probe-usb2-device \ -+@HALD_COMPILE_FREEBSD_TRUE@@HAVE_LIBUSB20_TRUE@ hald-probe-usb2-interface -+ - subdir = hald/freebsd/probing - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -@@ -48,12 +54,17 @@ am__configure_deps = $(am__aclocal_m4_de - mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = -+@HALD_COMPILE_FREEBSD_TRUE@@HAVE_LIBUSB20_TRUE@am__EXEEXT_1 = hald-probe-usb2-device$(EXEEXT) \ -+@HALD_COMPILE_FREEBSD_TRUE@@HAVE_LIBUSB20_TRUE@ hald-probe-usb2-interface$(EXEEXT) - am__installdirs = "$(DESTDIR)$(libexecdir)" - libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) - PROGRAMS = $(libexec_PROGRAMS) - am_hald_probe_hiddev_OBJECTS = probe-hiddev.$(OBJEXT) - hald_probe_hiddev_OBJECTS = $(am_hald_probe_hiddev_OBJECTS) - hald_probe_hiddev_DEPENDENCIES = $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la -+am_hald_probe_mouse_OBJECTS = hald_probe_mouse-probe-mouse.$(OBJEXT) -+hald_probe_mouse_OBJECTS = $(am_hald_probe_mouse_OBJECTS) -+hald_probe_mouse_DEPENDENCIES = $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la - am_hald_probe_scsi_OBJECTS = probe-scsi.$(OBJEXT) - hald_probe_scsi_OBJECTS = $(am_hald_probe_scsi_OBJECTS) - hald_probe_scsi_DEPENDENCIES = $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la -@@ -65,6 +76,17 @@ am_hald_probe_storage_OBJECTS = \ - hald_probe_storage-probe-storage.$(OBJEXT) - hald_probe_storage_OBJECTS = $(am_hald_probe_storage_OBJECTS) - hald_probe_storage_DEPENDENCIES = $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la -+am__hald_probe_usb2_device_SOURCES_DIST = probe-usb2-device.c -+@HAVE_LIBUSB20_TRUE@am_hald_probe_usb2_device_OBJECTS = \ -+@HAVE_LIBUSB20_TRUE@ probe-usb2-device.$(OBJEXT) -+hald_probe_usb2_device_OBJECTS = $(am_hald_probe_usb2_device_OBJECTS) -+@HAVE_LIBUSB20_TRUE@hald_probe_usb2_device_DEPENDENCIES = $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la -+am__hald_probe_usb2_interface_SOURCES_DIST = probe-usb2-interface.c -+@HAVE_LIBUSB20_TRUE@am_hald_probe_usb2_interface_OBJECTS = \ -+@HAVE_LIBUSB20_TRUE@ probe-usb2-interface.$(OBJEXT) -+hald_probe_usb2_interface_OBJECTS = \ -+ $(am_hald_probe_usb2_interface_OBJECTS) -+@HAVE_LIBUSB20_TRUE@hald_probe_usb2_interface_DEPENDENCIES = $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la - am_hald_probe_volume_OBJECTS = \ - hald_probe_volume-freebsd_dvd_rw_utils.$(OBJEXT) \ - hald_probe_volume-probe-volume.$(OBJEXT) -@@ -82,11 +104,17 @@ CCLD = $(CC) - LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ --SOURCES = $(hald_probe_hiddev_SOURCES) $(hald_probe_scsi_SOURCES) \ -- $(hald_probe_smbios_SOURCES) $(hald_probe_storage_SOURCES) \ -+SOURCES = $(hald_probe_hiddev_SOURCES) $(hald_probe_mouse_SOURCES) \ -+ $(hald_probe_scsi_SOURCES) $(hald_probe_smbios_SOURCES) \ -+ $(hald_probe_storage_SOURCES) \ -+ $(hald_probe_usb2_device_SOURCES) \ -+ $(hald_probe_usb2_interface_SOURCES) \ - $(hald_probe_volume_SOURCES) --DIST_SOURCES = $(hald_probe_hiddev_SOURCES) $(hald_probe_scsi_SOURCES) \ -+DIST_SOURCES = $(hald_probe_hiddev_SOURCES) \ -+ $(hald_probe_mouse_SOURCES) $(hald_probe_scsi_SOURCES) \ - $(hald_probe_smbios_SOURCES) $(hald_probe_storage_SOURCES) \ -+ $(am__hald_probe_usb2_device_SOURCES_DIST) \ -+ $(am__hald_probe_usb2_interface_SOURCES_DIST) \ - $(hald_probe_volume_SOURCES) - ETAGS = etags - CTAGS = ctags -@@ -263,6 +291,23 @@ hald_probe_hiddev_LDADD = \ - $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la \ - -lusbhid - -+@HAVE_LIBUSB20_TRUE@hald_probe_usb2_device_SOURCES = probe-usb2-device.c -+@HAVE_LIBUSB20_TRUE@hald_probe_usb2_device_LDADD = \ -+@HAVE_LIBUSB20_TRUE@ $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la \ -+@HAVE_LIBUSB20_TRUE@ @LIBUSB20_LIBS@ -+ -+@HAVE_LIBUSB20_TRUE@hald_probe_usb2_interface_SOURCES = probe-usb2-interface.c -+@HAVE_LIBUSB20_TRUE@hald_probe_usb2_interface_LDADD = \ -+@HAVE_LIBUSB20_TRUE@ $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la \ -+@HAVE_LIBUSB20_TRUE@ @LIBUSB20_LIBS@ -+ -+hald_probe_mouse_SOURCES = probe-mouse.c -+hald_probe_mouse_CPPFLAGS = $(AM_CPPFLAGS) @GLIB_CFLAGS@ -+hald_probe_mouse_LDADD = \ -+ @GLIB_LIBS@ \ -+ $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la \ -+ -lutil -+ - hald_probe_smbios_SOURCES = probe-smbios.c - hald_probe_smbios_LDADD = \ - $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la -@@ -283,6 +328,7 @@ hald_probe_volume_CPPFLAGS = $(AM_CPPFLA - hald_probe_volume_LDADD = \ - @GLIB_LIBS@ \ - @VOLUME_ID_LIBS@ \ -+ -lufs \ - $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la - - all: all-am -@@ -349,6 +395,9 @@ clean-libexecPROGRAMS: - hald-probe-hiddev$(EXEEXT): $(hald_probe_hiddev_OBJECTS) $(hald_probe_hiddev_DEPENDENCIES) - @rm -f hald-probe-hiddev$(EXEEXT) - $(LINK) $(hald_probe_hiddev_OBJECTS) $(hald_probe_hiddev_LDADD) $(LIBS) -+hald-probe-mouse$(EXEEXT): $(hald_probe_mouse_OBJECTS) $(hald_probe_mouse_DEPENDENCIES) -+ @rm -f hald-probe-mouse$(EXEEXT) -+ $(LINK) $(hald_probe_mouse_OBJECTS) $(hald_probe_mouse_LDADD) $(LIBS) - hald-probe-scsi$(EXEEXT): $(hald_probe_scsi_OBJECTS) $(hald_probe_scsi_DEPENDENCIES) - @rm -f hald-probe-scsi$(EXEEXT) - $(LINK) $(hald_probe_scsi_OBJECTS) $(hald_probe_scsi_LDADD) $(LIBS) -@@ -358,6 +407,12 @@ hald-probe-smbios$(EXEEXT): $(hald_probe - hald-probe-storage$(EXEEXT): $(hald_probe_storage_OBJECTS) $(hald_probe_storage_DEPENDENCIES) - @rm -f hald-probe-storage$(EXEEXT) - $(LINK) $(hald_probe_storage_OBJECTS) $(hald_probe_storage_LDADD) $(LIBS) -+hald-probe-usb2-device$(EXEEXT): $(hald_probe_usb2_device_OBJECTS) $(hald_probe_usb2_device_DEPENDENCIES) -+ @rm -f hald-probe-usb2-device$(EXEEXT) -+ $(LINK) $(hald_probe_usb2_device_OBJECTS) $(hald_probe_usb2_device_LDADD) $(LIBS) -+hald-probe-usb2-interface$(EXEEXT): $(hald_probe_usb2_interface_OBJECTS) $(hald_probe_usb2_interface_DEPENDENCIES) -+ @rm -f hald-probe-usb2-interface$(EXEEXT) -+ $(LINK) $(hald_probe_usb2_interface_OBJECTS) $(hald_probe_usb2_interface_LDADD) $(LIBS) - hald-probe-volume$(EXEEXT): $(hald_probe_volume_OBJECTS) $(hald_probe_volume_DEPENDENCIES) - @rm -f hald-probe-volume$(EXEEXT) - $(LINK) $(hald_probe_volume_OBJECTS) $(hald_probe_volume_LDADD) $(LIBS) -@@ -368,6 +423,7 @@ mostlyclean-compile: - distclean-compile: - -rm -f *.tab.c - -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hald_probe_mouse-probe-mouse.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hald_probe_storage-probe-storage.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hald_probe_volume-freebsd_dvd_rw_utils.Po@am__quote@ -@@ -375,6 +431,8 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/probe-hiddev.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/probe-scsi.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/probe-smbios.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/probe-usb2-device.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/probe-usb2-interface.Po@am__quote@ - - .c.o: - @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@@ -397,6 +455,20 @@ distclean-compile: - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - -+hald_probe_mouse-probe-mouse.o: probe-mouse.c -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_mouse_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_mouse-probe-mouse.o -MD -MP -MF $(DEPDIR)/hald_probe_mouse-probe-mouse.Tpo -c -o hald_probe_mouse-probe-mouse.o `test -f 'probe-mouse.c' || echo '$(srcdir)/'`probe-mouse.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hald_probe_mouse-probe-mouse.Tpo $(DEPDIR)/hald_probe_mouse-probe-mouse.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='probe-mouse.c' object='hald_probe_mouse-probe-mouse.o' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_mouse_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hald_probe_mouse-probe-mouse.o `test -f 'probe-mouse.c' || echo '$(srcdir)/'`probe-mouse.c -+ -+hald_probe_mouse-probe-mouse.obj: probe-mouse.c -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_mouse_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_mouse-probe-mouse.obj -MD -MP -MF $(DEPDIR)/hald_probe_mouse-probe-mouse.Tpo -c -o hald_probe_mouse-probe-mouse.obj `if test -f 'probe-mouse.c'; then $(CYGPATH_W) 'probe-mouse.c'; else $(CYGPATH_W) '$(srcdir)/probe-mouse.c'; fi` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hald_probe_mouse-probe-mouse.Tpo $(DEPDIR)/hald_probe_mouse-probe-mouse.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='probe-mouse.c' object='hald_probe_mouse-probe-mouse.obj' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_mouse_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hald_probe_mouse-probe-mouse.obj `if test -f 'probe-mouse.c'; then $(CYGPATH_W) 'probe-mouse.c'; else $(CYGPATH_W) '$(srcdir)/probe-mouse.c'; fi` -+ - hald_probe_storage-freebsd_dvd_rw_utils.o: freebsd_dvd_rw_utils.c - @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_storage_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_storage-freebsd_dvd_rw_utils.o -MD -MP -MF $(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Tpo -c -o hald_probe_storage-freebsd_dvd_rw_utils.o `test -f 'freebsd_dvd_rw_utils.c' || echo '$(srcdir)/'`freebsd_dvd_rw_utils.c - @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Tpo $(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Po |