diff options
| author | William Jon McCann <mccann@jhu.edu> | 2007-10-04 21:42:29 +0000 |
|---|---|---|
| committer | William Jon McCann <mccann@src.gnome.org> | 2007-10-04 21:42:29 +0000 |
| commit | 14333ef1ffc4d2c5b162d2631c52ab71d88a2641 (patch) | |
| tree | 3035ae1a2d72a71eda144c7d8e2b91c35e837337 /utils/Makefile.am | |
| parent | dae89542cc21cd03bb0debe651b3e30b84289478 (diff) | |
| download | gdm-14333ef1ffc4d2c5b162d2631c52ab71d88a2641.tar.gz | |
Remove lots of obsolete code. Organize the configure checks a bit.
2007-10-04 William Jon McCann <mccann@jhu.edu>
* common/Makefile.am:
* common/gdm-common.c:
* common/gdm-common.h:
* common/ve-signal.c:
* common/ve-signal.h:
* config/Makefile.am:
* configure.ac:
* daemon/Makefile.am:
* daemon/auth.c:
* daemon/filecheck.c:
* daemon/filecheck.h:
* daemon/gdm-factory-slave.c: (get_script_environment):
* daemon/gdm-greeter-session.c: (get_greeter_environment):
* daemon/gdm-product-slave.c: (get_script_environment):
* daemon/gdm-server.c: (rotate_logs), (server_child_setup),
(gdm_server_start):
* daemon/gdm-simple-slave.c: (get_script_environment):
* daemon/gdm-xdmcp-display-factory.c: (fd_set_close_on_exec),
(open_port), (gdm_xdmcp_handle_request), (gdm_xdmcp_handle_manage):
* libgreeter/Makefile.am:
* libgreeter/gdmlanguages.c:
* libgreeter/gdmlanguages.h:
* libgreeter/gdmsession.c:
* libgreeter/gdmsession.h:
* libgreeter/gdmwm.c:
* libgreeter/gdmwm.h:
* utils/Makefile.am:
* utils/gdm-ssh-session:
* utils/gdmmktemp.c:
* utils/gdmopen.c:
* utils/gdmprefetch.c:
* utils/gdmsetup-pam:
* utils/gdmsetup-security.in:
* utils/gdmtranslate.c:
Remove lots of obsolete code. Organize the configure checks a bit.
svn path=/branches/mccann-gobject/; revision=5339
Diffstat (limited to 'utils/Makefile.am')
| -rw-r--r-- | utils/Makefile.am | 54 |
1 files changed, 2 insertions, 52 deletions
diff --git a/utils/Makefile.am b/utils/Makefile.am index 4fd77894..19dc4201 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -1,16 +1,11 @@ NULL = -DEFS = @DEFS@ -DGDM_CONFIG_FILE=\"$(gdmconfdir)/gdm.conf\" \ - -DGDM_FACTORY_CONFIG_FILE=\"$(gdmconfdir)/factory-gdm.conf\" \ - -DGDM_GLADE_DIR=\"@datadir@/gdm\" - INCLUDES = \ -I. \ -I.. \ - -I$(top_srcdir)/daemon \ - -I$(top_srcdir)/vicious-extensions \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - $(UTILS_CFLAGS) + $(UTILS_CFLAGS) \ + $(NULL) edit = sed \ -e 's|@sbindir[@]|$(sbindir)|g' \ @@ -24,9 +19,6 @@ gdm-restart: gdm-restart.in Makefile $(edit) $< >$@ gdm-safe-restart: gdm-safe-restart.in Makefile $(edit) $< >$@ -gdmsetup: gdmsetup-security.in - $(edit) <$(srcdir)/gdmsetup-security.in >gdmsetup - sbin_SCRIPTS = \ gdm-stop \ @@ -35,44 +27,15 @@ sbin_SCRIPTS = \ $(NULL) EXTRA_DIST = \ - gdm-ssh-session \ gdm-stop.in \ gdm-restart.in \ gdm-safe-restart.in \ - gdmsetup-pam \ - gdmsetup-security.in \ $(NULL) -libexec_SCRIPTS = \ - @GDMSSHSESSION@ - -libexec_PROGRAMS = \ - @GDMOPEN@ \ - @GDMPREFETCH@ \ - gdmtranslate - if DMX_SUPPORT bin_PROGRAMS = gdm-dmx-reconnect-proxy endif -EXTRA_SCRIPTS = gdm-ssh-session -EXTRA_PROGRAMS = gdmopen gdmprefetch - -gdmtranslate_SOURCES = \ - gdmtranslate.c - -gdmopen_SOURCES = \ - gdmopen.c - -gdmprefetch_SOURCES = \ - gdmprefetch.c - -gdmopen_LDADD = \ - $(INTLLIBS) - -gdmtranslate_LDADD = \ - $(INTLLIBS) - if DMX_SUPPORT gdm_dmx_reconnect_proxy_SOURCES = \ gdm-dmx-reconnect-proxy.c @@ -85,23 +48,10 @@ gdm_dmx_reconnect_proxy_LDADD = \ $(DMX_LIBS) endif -if CONSOLE_HELPER -cappsdir = $(PAM_PREFIX)/security/console.apps -capps_DATA = gdmsetup - -install-data-local: - $(mkinstalldirs) $(DESTDIR)$(PAM_PREFIX)/pam.d - $(INSTALL_DATA) $(srcdir)/gdmsetup-pam $(DESTDIR)$(PAM_PREFIX)/pam.d/gdmsetup -else -install-data-local: -endif - CLEANFILES = \ - gdmsetup-security \ $(NULL) DISTCLEANFILES = \ - gdmsetup \ gdm-stop \ gdm-restart \ gdm-safe-restart \ |