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	\