diff options
| author | marha <marha@users.sourceforge.net> | 2010-01-05 08:57:42 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-01-05 08:57:42 +0000 |
| commit | 4b1326f06330c00501dd84100ed3a1987e2fa631 (patch) | |
| tree | 6675ebcf771a6fdfeb9a2164f08811407731482e /xorg-server/config/Makefile.am | |
| parent | 7397e255c2e82618ab55ef2c81636c8e688b1225 (diff) | |
| parent | 163827567b71b0763a4c1a7104159cd08b5c2d95 (diff) | |
| download | vcxsrv-4b1326f06330c00501dd84100ed3a1987e2fa631.tar.gz vcxsrv-4b1326f06330c00501dd84100ed3a1987e2fa631.tar.bz2 vcxsrv-4b1326f06330c00501dd84100ed3a1987e2fa631.zip | |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/config/Makefile.am')
| -rw-r--r-- | xorg-server/config/Makefile.am | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/xorg-server/config/Makefile.am b/xorg-server/config/Makefile.am index 7fa2df877..27f251b3a 100644 --- a/xorg-server/config/Makefile.am +++ b/xorg-server/config/Makefile.am @@ -1,12 +1,20 @@ -AM_CFLAGS = @DIX_CFLAGS@ +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) + +else + if CONFIG_NEED_DBUS -AM_CFLAGS += @DBUS_CFLAGS@ +AM_CFLAGS += $(DBUS_CFLAGS) libconfig_la_SOURCES += dbus-core.c -endif +libconfig_la_LIBADD = $(DBUS_LIBS) if CONFIG_DBUS_API dbusconfigdir = $(sysconfdir)/dbus-1/system.d @@ -16,7 +24,13 @@ 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 |