23ce881407
This allows hal to properly reflect the correct access device, and prevents X from opening the same device twice * Use the less expensive clock_gettime() instead of gettimeofday() in hal's pollers [1] * Add support for locking storage devices * Fix the path to the installed documentation Submitted by: jkim [1] Tested by: jkim, cokane, and a host of others
92 lines
5.6 KiB
Text
92 lines
5.6 KiB
Text
--- hald/freebsd/addons/Makefile.in.orig 2008-03-27 00:45:50.000000000 -0400
|
|
+++ hald/freebsd/addons/Makefile.in 2008-03-27 00:48:15.000000000 -0400
|
|
@@ -33,7 +33,8 @@ POST_UNINSTALL = :
|
|
build_triplet = @build@
|
|
host_triplet = @host@
|
|
@HALD_COMPILE_FREEBSD_TRUE@libexec_PROGRAMS = \
|
|
-@HALD_COMPILE_FREEBSD_TRUE@ hald-addon-storage$(EXEEXT)
|
|
+@HALD_COMPILE_FREEBSD_TRUE@ hald-addon-storage$(EXEEXT) \
|
|
+@HALD_COMPILE_FREEBSD_TRUE@ hald-addon-mouse-sysmouse$(EXEEXT)
|
|
subdir = hald/freebsd/addons
|
|
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
|
|
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
|
@@ -47,6 +48,15 @@ CONFIG_CLEAN_FILES =
|
|
am__installdirs = "$(DESTDIR)$(libexecdir)"
|
|
libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
|
|
PROGRAMS = $(libexec_PROGRAMS)
|
|
+am_hald_addon_mouse_sysmouse_OBJECTS = \
|
|
+ hald_addon_mouse_sysmouse-addon-mouse.$(OBJEXT)
|
|
+hald_addon_mouse_sysmouse_OBJECTS = \
|
|
+ $(am_hald_addon_mouse_sysmouse_OBJECTS)
|
|
+hald_addon_mouse_sysmouse_DEPENDENCIES = $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la
|
|
+hald_addon_mouse_sysmouse_LINK = $(LIBTOOL) --tag=CC \
|
|
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
|
|
+ $(hald_addon_mouse_sysmouse_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
|
|
+ $(LDFLAGS) -o $@
|
|
am_hald_addon_storage_OBJECTS = addon-storage.$(OBJEXT)
|
|
hald_addon_storage_OBJECTS = $(am_hald_addon_storage_OBJECTS)
|
|
hald_addon_storage_DEPENDENCIES = $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la
|
|
@@ -62,8 +72,10 @@ CCLD = $(CC)
|
|
LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
|
|
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
|
|
$(LDFLAGS) -o $@
|
|
-SOURCES = $(hald_addon_storage_SOURCES)
|
|
-DIST_SOURCES = $(hald_addon_storage_SOURCES)
|
|
+SOURCES = $(hald_addon_mouse_sysmouse_SOURCES) \
|
|
+ $(hald_addon_storage_SOURCES)
|
|
+DIST_SOURCES = $(hald_addon_mouse_sysmouse_SOURCES) \
|
|
+ $(hald_addon_storage_SOURCES)
|
|
ETAGS = etags
|
|
CTAGS = ctags
|
|
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
|
@@ -227,6 +239,11 @@ hald_addon_storage_SOURCES = addon-stora
|
|
hald_addon_storage_LDADD = \
|
|
$(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la
|
|
|
|
+hald_addon_mouse_sysmouse_SOURCES = addon-mouse.c
|
|
+hald_addon_mouse_sysmouse_CFLAGS = $(AM_CPPFLAGS) @GLIB_CFLAGS@
|
|
+hald_addon_mouse_sysmouse_LDADD = @GLIB_LIBS@ \
|
|
+ $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la
|
|
+
|
|
all: all-am
|
|
|
|
.SUFFIXES:
|
|
@@ -288,6 +305,9 @@ clean-libexecPROGRAMS:
|
|
echo " rm -f $$p $$f"; \
|
|
rm -f $$p $$f ; \
|
|
done
|
|
+hald-addon-mouse-sysmouse$(EXEEXT): $(hald_addon_mouse_sysmouse_OBJECTS) $(hald_addon_mouse_sysmouse_DEPENDENCIES)
|
|
+ @rm -f hald-addon-mouse-sysmouse$(EXEEXT)
|
|
+ $(hald_addon_mouse_sysmouse_LINK) $(hald_addon_mouse_sysmouse_OBJECTS) $(hald_addon_mouse_sysmouse_LDADD) $(LIBS)
|
|
hald-addon-storage$(EXEEXT): $(hald_addon_storage_OBJECTS) $(hald_addon_storage_DEPENDENCIES)
|
|
@rm -f hald-addon-storage$(EXEEXT)
|
|
$(LINK) $(hald_addon_storage_OBJECTS) $(hald_addon_storage_LDADD) $(LIBS)
|
|
@@ -299,6 +319,7 @@ distclean-compile:
|
|
-rm -f *.tab.c
|
|
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/addon-storage.Po@am__quote@
|
|
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hald_addon_mouse_sysmouse-addon-mouse.Po@am__quote@
|
|
|
|
.c.o:
|
|
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
|
@@ -321,6 +342,20 @@ distclean-compile:
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
|
|
|
|
+hald_addon_mouse_sysmouse-addon-mouse.o: addon-mouse.c
|
|
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hald_addon_mouse_sysmouse_CFLAGS) $(CFLAGS) -MT hald_addon_mouse_sysmouse-addon-mouse.o -MD -MP -MF $(DEPDIR)/hald_addon_mouse_sysmouse-addon-mouse.Tpo -c -o hald_addon_mouse_sysmouse-addon-mouse.o `test -f 'addon-mouse.c' || echo '$(srcdir)/'`addon-mouse.c
|
|
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hald_addon_mouse_sysmouse-addon-mouse.Tpo $(DEPDIR)/hald_addon_mouse_sysmouse-addon-mouse.Po
|
|
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='addon-mouse.c' object='hald_addon_mouse_sysmouse-addon-mouse.o' libtool=no @AMDEPBACKSLASH@
|
|
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hald_addon_mouse_sysmouse_CFLAGS) $(CFLAGS) -c -o hald_addon_mouse_sysmouse-addon-mouse.o `test -f 'addon-mouse.c' || echo '$(srcdir)/'`addon-mouse.c
|
|
+
|
|
+hald_addon_mouse_sysmouse-addon-mouse.obj: addon-mouse.c
|
|
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hald_addon_mouse_sysmouse_CFLAGS) $(CFLAGS) -MT hald_addon_mouse_sysmouse-addon-mouse.obj -MD -MP -MF $(DEPDIR)/hald_addon_mouse_sysmouse-addon-mouse.Tpo -c -o hald_addon_mouse_sysmouse-addon-mouse.obj `if test -f 'addon-mouse.c'; then $(CYGPATH_W) 'addon-mouse.c'; else $(CYGPATH_W) '$(srcdir)/addon-mouse.c'; fi`
|
|
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hald_addon_mouse_sysmouse-addon-mouse.Tpo $(DEPDIR)/hald_addon_mouse_sysmouse-addon-mouse.Po
|
|
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='addon-mouse.c' object='hald_addon_mouse_sysmouse-addon-mouse.obj' libtool=no @AMDEPBACKSLASH@
|
|
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hald_addon_mouse_sysmouse_CFLAGS) $(CFLAGS) -c -o hald_addon_mouse_sysmouse-addon-mouse.obj `if test -f 'addon-mouse.c'; then $(CYGPATH_W) 'addon-mouse.c'; else $(CYGPATH_W) '$(srcdir)/addon-mouse.c'; fi`
|
|
+
|
|
mostlyclean-libtool:
|
|
-rm -f *.lo
|
|
|