diff options
| author | marha <marha@users.sourceforge.net> | 2010-01-04 15:34:07 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-01-04 15:34:07 +0000 |
| commit | 33a317f48eb3fe888177235ee49b635fbb8cda2f (patch) | |
| tree | ef06bc25b3a9d4096e65b8a6a11e7e8f7e7ee3c6 /xorg-server/config/Makefile.am | |
| parent | 1e723abc27bdc2ad675bce79467a7308c2966861 (diff) | |
| download | vcxsrv-33a317f48eb3fe888177235ee49b635fbb8cda2f.tar.gz vcxsrv-33a317f48eb3fe888177235ee49b635fbb8cda2f.tar.bz2 vcxsrv-33a317f48eb3fe888177235ee49b635fbb8cda2f.zip | |
Git update 4/1/2010
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 |