diff options
| author | marha <marha@users.sourceforge.net> | 2010-06-11 12:14:52 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-06-11 12:14:52 +0000 |
| commit | 4c61bf84b11e26e6f22648668c95ea760a379163 (patch) | |
| tree | 0ac762ab2815eae283dded7447ad7cb5a54b926a /xorg-server/config/Makefile.am | |
| parent | e1dabd2ce8be0d70c6c15353b58de256129dfd1f (diff) | |
| download | vcxsrv-4c61bf84b11e26e6f22648668c95ea760a379163.tar.gz vcxsrv-4c61bf84b11e26e6f22648668c95ea760a379163.tar.bz2 vcxsrv-4c61bf84b11e26e6f22648668c95ea760a379163.zip | |
xserver git update 11/6/2010
Diffstat (limited to 'xorg-server/config/Makefile.am')
| -rw-r--r-- | xorg-server/config/Makefile.am | 78 |
1 files changed, 39 insertions, 39 deletions
diff --git a/xorg-server/config/Makefile.am b/xorg-server/config/Makefile.am index 675a3b260..d8a7b45f6 100644 --- a/xorg-server/config/Makefile.am +++ b/xorg-server/config/Makefile.am @@ -1,39 +1,39 @@ -AM_CFLAGS = $(DIX_CFLAGS) - -noinst_LTLIBRARIES = libconfig.la -libconfig_la_SOURCES = config.c config-backends.h - -if CONFIG_UDEV - -AM_CFLAGS += $(UDEV_CFLAGS) -libconfig_la_SOURCES += udev.c -libconfig_la_LIBADD = $(UDEV_LIBS) - -xorgconfddir = $(datadir)/X11/$(XF86CONFIGDIR) -xorgconfd_DATA = 10-evdev.conf - -else - -if CONFIG_NEED_DBUS -AM_CFLAGS += $(DBUS_CFLAGS) -libconfig_la_SOURCES += dbus-core.c -libconfig_la_LIBADD = $(DBUS_LIBS) - -if CONFIG_DBUS_API -dbusconfigdir = $(sysconfdir)/dbus-1/system.d -dbusconfig_DATA = xorg-server.conf - -libconfig_la_SOURCES += dbus.c -endif - -if CONFIG_HAL -AM_CFLAGS += $(HAL_CFLAGS) -libconfig_la_SOURCES += hal.c -libconfig_la_LIBADD += $(HAL_LIBS) -endif - -endif # CONFIG_NEED_DBUS - -endif # !CONFIG_UDEV - -EXTRA_DIST = xorg-server.conf x11-input.fdi 10-evdev.conf +AM_CFLAGS = $(DIX_CFLAGS)
+
+noinst_LTLIBRARIES = libconfig.la
+libconfig_la_SOURCES = config.c config-backends.h
+
+if CONFIG_UDEV
+
+AM_CFLAGS += $(UDEV_CFLAGS)
+libconfig_la_SOURCES += udev.c
+libconfig_la_LIBADD = $(UDEV_LIBS)
+
+xorgconfddir = $(datadir)/X11/$(XF86CONFIGDIR)
+xorgconfd_DATA = 10-evdev.conf
+
+else
+
+if CONFIG_NEED_DBUS
+AM_CFLAGS += $(DBUS_CFLAGS)
+libconfig_la_SOURCES += dbus-core.c
+libconfig_la_LIBADD = $(DBUS_LIBS)
+
+if CONFIG_DBUS_API
+dbusconfigdir = $(sysconfdir)/dbus-1/system.d
+dbusconfig_DATA = xorg-server.conf
+
+libconfig_la_SOURCES += dbus.c
+endif
+
+if CONFIG_HAL
+AM_CFLAGS += $(HAL_CFLAGS)
+libconfig_la_SOURCES += hal.c
+libconfig_la_LIBADD += $(HAL_LIBS)
+endif
+
+endif # CONFIG_NEED_DBUS
+
+endif # !CONFIG_UDEV
+
+EXTRA_DIST = xorg-server.conf x11-input.fdi 10-evdev.conf fdi2iclass.py
|