hal/tools/linux .cvsignore, 1.3, 1.4 90-hal.rules, NONE, 1.1 Makefile.am, 1.15, 1.16 hal_hotplug.c, 1.31, NONE

[Kay Sievers]

Update of /cvs/hal/hal/tools/linux
In directory gabe:/tmp/cvs-serv12064/tools/linux

Modified Files:
	.cvsignore Makefile.am 
Added Files:
	90-hal.rules 
Removed Files:
	hal_hotplug.c 
Log Message:
2006-01-21  Kay Sievers  <kay.sievers at vrfy.org>

        Remove hotplug helper and depend on udev passing events over
        a socket.

        * configure.in:
        * hald/linux2/osspec.c: (osspec_init):
        * tools/linux/.cvsignore:
        * tools/linux/90-hal.rules:
        * tools/linux/Makefile.am:
        * tools/linux/hal_hotplug.c:



Index: .cvsignore
===================================================================
RCS file: /cvs/hal/hal/tools/linux/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- .cvsignore	21 Jun 2005 16:57:21 -0000	1.3
+++ .cvsignore	21 Jan 2006 19:39:58 -0000	1.4
@@ -2,6 +2,3 @@
 .libs
 Makefile
 Makefile.in
-hal.hotplug
-hal.dev
-hald-add-selinux-mount-option

--- NEW FILE: 90-hal.rules ---
# pass all events to the HAL daemon
RUN+="socket:/org/freedesktop/hal/udev_event"

Index: Makefile.am
===================================================================
RCS file: /cvs/hal/hal/tools/linux/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile.am	21 Jan 2006 17:59:48 -0000	1.15
+++ Makefile.am	21 Jan 2006 19:39:58 -0000	1.16
@@ -1,27 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = \
-	-DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" \
-	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-	-DPACKAGE_BIN_DIR=\""$(bindir)"\" \
-	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-	-DPACKAGE_LOCALSTATEDIR=\""$(localstatedir)"\" \
-	-I$(top_srcdir) \
-	@PACKAGE_CFLAGS@
-
-libexec_PROGRAMS = hal.hotplug
-
-hal_hotplug_SOURCES = hal_hotplug.c
-
-
-clean-local :
-	rm -f *~
-
-install-data-local :
-	$(mkinstalldirs) $(DESTDIR)$(LINUX_HOTPLUG_DIR)/default
-	- cd $(DESTDIR)$(LINUX_HOTPLUG_DIR)/default && $(LN_S) $(libexecdir)/hal.hotplug 20-hal.hotplug
-
-uninstall-local :
-	- rm -f $(DESTDIR)$(LINUX_HOTPLUG_DIR)/default/20-hal.hotplug
-
+udevrulesdir = $(sysconfdir)/udev/rules.d
+udevrules_DATA = 90-hal.rules
 

--- hal_hotplug.c DELETED ---