Prevents the use of per target flags.
Clearly shows which libraries and compiler options apply.
Signed-off-by: Gaetan Nadon mems...@videotron.ca
---
.gitignore |5 +--
Makefile.am | 60 +--
configure.ac |1 +
xdm/.gitignore |1 +
xdm/Makefile.am | 79 ++
access.c = xdm/access.c |0
auth.c = xdm/auth.c |0
choose.c = xdm/choose.c |0
daemon.c = xdm/daemon.c |0
dm.c = xdm/dm.c |0
dpylist.c = xdm/dpylist.c |0
error.c = xdm/error.c |0
file.c = xdm/file.c |0
genauth.c = xdm/genauth.c |0
krb5auth.c = xdm/krb5auth.c |0
mitauth.c = xdm/mitauth.c |0
netaddr.c = xdm/netaddr.c |0
policy.c = xdm/policy.c |0
prngc.c = xdm/prngc.c |0
protodpy.c = xdm/protodpy.c |0
reset.c = xdm/reset.c |0
resource.c = xdm/resource.c |0
rpcauth.c = xdm/rpcauth.c |0
server.c = xdm/server.c |0
session.c = xdm/session.c |0
socket.c = xdm/socket.c |0
streams.c = xdm/streams.c |0
util.c = xdm/util.c |0
xdmauth.c = xdm/xdmauth.c |0
xdmcp.c = xdm/xdmcp.c |0
30 files changed, 85 insertions(+), 61 deletions(-)
create mode 100644 xdm/.gitignore
create mode 100644 xdm/Makefile.am
rename access.c = xdm/access.c (100%)
rename auth.c = xdm/auth.c (100%)
rename choose.c = xdm/choose.c (100%)
rename daemon.c = xdm/daemon.c (100%)
rename dm.c = xdm/dm.c (100%)
rename dpylist.c = xdm/dpylist.c (100%)
rename error.c = xdm/error.c (100%)
rename file.c = xdm/file.c (100%)
rename genauth.c = xdm/genauth.c (100%)
rename krb5auth.c = xdm/krb5auth.c (100%)
rename mitauth.c = xdm/mitauth.c (100%)
rename netaddr.c = xdm/netaddr.c (100%)
rename policy.c = xdm/policy.c (100%)
rename prngc.c = xdm/prngc.c (100%)
rename protodpy.c = xdm/protodpy.c (100%)
rename reset.c = xdm/reset.c (100%)
rename resource.c = xdm/resource.c (100%)
rename rpcauth.c = xdm/rpcauth.c (100%)
rename server.c = xdm/server.c (100%)
rename session.c = xdm/session.c (100%)
rename socket.c = xdm/socket.c (100%)
rename streams.c = xdm/streams.c (100%)
rename util.c = xdm/util.c (100%)
rename xdmauth.c = xdm/xdmauth.c (100%)
rename xdmcp.c = xdm/xdmcp.c (100%)
diff --git a/.gitignore b/.gitignore
index 38a8090..fbf6b92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,9 +71,8 @@ core
*.tar.bz2
*.tar.gz
#
-# Add Override patterns for xdm
+# Add Override patterns for xdm
#
# Edit the following section as needed
# For example, !report.pc overrides *.pc. See 'man gitignore'
-#
-xdm
+#
diff --git a/Makefile.am b/Makefile.am
index c750ea5..90fc161 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,64 +19,7 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
-SUBDIRS = chooser config greeter include man xdmshell
-
-bin_PROGRAMS = xdm
-AM_CPPFLAGS = -I$(top_srcdir)/include
-AM_CFLAGS = $(CWARNFLAGS)
-
-#
-# xdm
-#
-
-xdm_CFLAGS = $(XDM_CFLAGS)
-# The xdm binary needs to export symbols so that they can be used from
-# libXdmGreet.so loaded through a dlopen call from session.c
-xdm_LDFLAGS = -export-dynamic
-xdm_LDADD = $(XDM_LIBS)
-
-xdm_SOURCES = \
-auth.c \
-daemon.c \
-server.c \
-dpylist.c \
-dm.c \
-error.c \
-file.c \
-netaddr.c \
-reset.c \
-resource.c \
-protodpy.c \
-policy.c \
-session.c \
-socket.c \
-streams.c \
-util.c \
-xdmcp.c \
-mitauth.c \
-genauth.c \
-access.c \
-choose.c
-
-if HAS_XDM_AUTH
-xdm_CFLAGS += -DHASXDMAUTH
-xdm_SOURCES += xdmauth.c
-endif
-
-if !HAVE_ARC4RANDOM
-xdm_SOURCES += prngc.c
-endif
-
-if HAS_SECURE_RPC
-xdm_CFLAGS += -DSECURE_RPC
-xdm_SOURCES += rpcauth.c
-endif
-
-if HAS_KERBEROS_FIVE
-xdm_SOURCES += krb5auth.c
-endif
-
-# App default files
+SUBDIRS = chooser config greeter include man xdm xdmshell
# This ensures distcheck is performed in a location where user has write access
DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults
@@ -89,6 +32,7 @@ ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) \
lint:
$(LINT) $(ALL_LINT_FLAGS) $(xdm_CFLAGS) $(xdm_SOURCES) $(xdm_LIBS)
+ (cd xdm $(MAKE) $(AM_MAKEFLAGS) lint)
(cd xdmshell $(MAKE) $(AM_MAKEFLAGS) lint)
(cd greeter $(MAKE) $(AM_MAKEFLAGS) lint)
(cd chooser $(MAKE) $(AM_MAKEFLAGS) lint)
diff --git a/configure.ac b/configure.ac
index a690ff7..dd90d51 100644
--- a/configure.ac
+++ b/configure.ac
@@ -542,5 +542,6 @@ AC_CONFIG_FILES([Makefile
greeter/Makefile
include/Makefile
man/Makefile
+
