diff options
| author | William Jon McCann <mccann@jhu.edu> | 2007-10-04 15:14:48 +0000 |
|---|---|---|
| committer | William Jon McCann <mccann@src.gnome.org> | 2007-10-04 15:14:48 +0000 |
| commit | dae89542cc21cd03bb0debe651b3e30b84289478 (patch) | |
| tree | 693c854e5ae8a8f84921a373ba7682323f4f2bcc /common | |
| parent | f0de3c35d5b967f4117497ba3f5b9d9362b31dd1 (diff) | |
| download | gdm-dae89542cc21cd03bb0debe651b3e30b84289478.tar.gz | |
Fix up the handling of dependencies. Make the daemon only depend on x11,
2007-10-04 William Jon McCann <mccann@jhu.edu>
* acinclude.m4:
* common/Makefile.am:
* configure.ac:
* daemon/Makefile.am:
* daemon/gdm-factory-slave.c: (run_greeter),
(idle_connect_to_display):
* daemon/gdm-product-slave.c: (setup_server),
(idle_connect_to_display):
* daemon/gdm-simple-slave.c: (run_greeter),
(idle_connect_to_display):
* daemon/gdm-slave.c: (gdm_slave_set_busy_cursor),
(set_local_auth), (gdm_slave_connect_to_x11_display):
* daemon/gdm-slave.h:
* gui/Makefile.am:
* gui/modules/.cvsignore:
* gui/modules/AccessDwellMouseEvents.in:
* gui/modules/AccessKeyMouseEvents.in:
* gui/modules/Makefile.am:
* gui/modules/dwellmouselistener.c:
* gui/modules/keymouselistener.c:
* gui/simple-chooser/Makefile.am:
* gui/simple-greeter/Makefile.am:
* gui/simple-greeter/libnotificationarea/Makefile.am:
* libgreeter/Makefile.am:
Fix up the handling of dependencies. Make the daemon
only depend on x11, glib, gobject, dbus. Move some
things from the slaves to the base class.
Remove the unused modules for now.
svn path=/branches/mccann-gobject/; revision=5338
Diffstat (limited to 'common')
| -rw-r--r-- | common/Makefile.am | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/common/Makefile.am b/common/Makefile.am index d1b31b93..1d3afce1 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -3,9 +3,9 @@ NULL = INCLUDES = \ - -I. \ - -I.. \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -I. \ + -I.. \ + -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -DAUTHDIR=\"$(authdir)\" \ -DBINDIR=\"$(bindir)\" \ -DDATADIR=\"$(datadir)\" \ @@ -21,8 +21,8 @@ INCLUDES = \ -DGDM_DEFAULTS_CONF=\"$(GDM_DEFAULTS_CONF)\" \ -DGDM_CUSTOM_CONF=\"$(GDM_CUSTOM_CONF)\" \ -DGDM_OLD_CONF=\"$(GDM_OLD_CONF)\" \ - $(DBUS_CFLAGS) \ - $(GLIB_CFLAGS) + $(COMMON_CFLAGS) \ + $(NULL) noinst_LTLIBRARIES = \ libgdmcommon.la \ @@ -79,7 +79,7 @@ libgdmcommon_la_CPPFLAGS = \ $(NULL) libgdmcommon_la_CFLAGS = \ - $(DBUS_CFLAGS) \ + $(COMMON_CFLAGS) \ $(NULL) libgdmcommon_la_LIBADD = \ @@ -101,7 +101,7 @@ test_log_SOURCES = \ test_log_LDADD = \ libgdmcommon.la \ - $(GLIB_LIBS) \ + $(COMMON_LIBS) \ $(NULL) test_settings_server_SOURCES = \ @@ -110,8 +110,7 @@ test_settings_server_SOURCES = \ test_settings_server_LDADD = \ libgdmcommon.la \ - $(GLIB_LIBS) \ - $(DBUS_LIBS) \ + $(COMMON_LIBS) \ $(NULL) test_settings_client_SOURCES = \ @@ -120,8 +119,7 @@ test_settings_client_SOURCES = \ test_settings_client_LDADD = \ libgdmcommon.la \ - $(GLIB_LIBS) \ - $(DBUS_LIBS) \ + $(COMMON_LIBS) \ $(NULL) CLEANFILES = \ |