[PATCH app-xdm 5/5] config: mv xdm in its own directory
Gaetan Nadon
memsize at videotron.ca
Mon Nov 22 07:32:49 PST 2010
Prevents the use of per target flags.
Clearly shows which libraries and compiler options apply.
Signed-off-by: Gaetan Nadon <memsize at 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
+ xdm/Makefile
xdmshell/Makefile])
AC_OUTPUT
diff --git a/xdm/.gitignore b/xdm/.gitignore
new file mode 100644
index 0000000..495d577
--- /dev/null
+++ b/xdm/.gitignore
@@ -0,0 +1 @@
+xdm
diff --git a/xdm/Makefile.am b/xdm/Makefile.am
new file mode 100644
index 0000000..aa9765c
--- /dev/null
+++ b/xdm/Makefile.am
@@ -0,0 +1,79 @@
+#
+# Copyright 2005 Red Hat, Inc.
+#
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation, and that the name of Red Hat not be used in
+# advertising or publicity pertaining to distribution of the software without
+# specific, written prior permission. Red Hat makes no
+# representations about the suitability of this software for any purpose. It
+# is provided "as is" without express or implied warranty.
+#
+# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+# EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+
+bin_PROGRAMS = xdm
+
+AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CFLAGS = $(CWARNFLAGS) $(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
+AM_LDFLAGS = $(XDM_LIBS) -export-dynamic
+
+xdm_SOURCES = \
+ access.c \
+ auth.c \
+ choose.c \
+ daemon.c \
+ dm.c \
+ dpylist.c \
+ error.c \
+ file.c \
+ genauth.c \
+ mitauth.c \
+ netaddr.c \
+ policy.c \
+ protodpy.c \
+ reset.c \
+ resource.c \
+ server.c \
+ session.c \
+ socket.c \
+ streams.c \
+ util.c \
+ xdmcp.c
+
+if HAS_XDM_AUTH
+AM_CFLAGS += -DHASXDMAUTH
+xdm_SOURCES += xdmauth.c
+endif
+
+if !HAVE_ARC4RANDOM
+xdm_SOURCES += prngc.c
+endif
+
+if HAS_SECURE_RPC
+AM_CFLAGS += -DSECURE_RPC
+xdm_SOURCES += rpcauth.c
+endif
+
+if HAS_KERBEROS_FIVE
+xdm_SOURCES += krb5auth.c
+endif
+
+if LINT
+ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
+
+lint:
+ $(LINT) $(ALL_LINT_FLAGS) $(xdm_SOURCES) $(XDM_LIBS)
+
+endif LINT
diff --git a/access.c b/xdm/access.c
similarity index 100%
rename from access.c
rename to xdm/access.c
diff --git a/auth.c b/xdm/auth.c
similarity index 100%
rename from auth.c
rename to xdm/auth.c
diff --git a/choose.c b/xdm/choose.c
similarity index 100%
rename from choose.c
rename to xdm/choose.c
diff --git a/daemon.c b/xdm/daemon.c
similarity index 100%
rename from daemon.c
rename to xdm/daemon.c
diff --git a/dm.c b/xdm/dm.c
similarity index 100%
rename from dm.c
rename to xdm/dm.c
diff --git a/dpylist.c b/xdm/dpylist.c
similarity index 100%
rename from dpylist.c
rename to xdm/dpylist.c
diff --git a/error.c b/xdm/error.c
similarity index 100%
rename from error.c
rename to xdm/error.c
diff --git a/file.c b/xdm/file.c
similarity index 100%
rename from file.c
rename to xdm/file.c
diff --git a/genauth.c b/xdm/genauth.c
similarity index 100%
rename from genauth.c
rename to xdm/genauth.c
diff --git a/krb5auth.c b/xdm/krb5auth.c
similarity index 100%
rename from krb5auth.c
rename to xdm/krb5auth.c
diff --git a/mitauth.c b/xdm/mitauth.c
similarity index 100%
rename from mitauth.c
rename to xdm/mitauth.c
diff --git a/netaddr.c b/xdm/netaddr.c
similarity index 100%
rename from netaddr.c
rename to xdm/netaddr.c
diff --git a/policy.c b/xdm/policy.c
similarity index 100%
rename from policy.c
rename to xdm/policy.c
diff --git a/prngc.c b/xdm/prngc.c
similarity index 100%
rename from prngc.c
rename to xdm/prngc.c
diff --git a/protodpy.c b/xdm/protodpy.c
similarity index 100%
rename from protodpy.c
rename to xdm/protodpy.c
diff --git a/reset.c b/xdm/reset.c
similarity index 100%
rename from reset.c
rename to xdm/reset.c
diff --git a/resource.c b/xdm/resource.c
similarity index 100%
rename from resource.c
rename to xdm/resource.c
diff --git a/rpcauth.c b/xdm/rpcauth.c
similarity index 100%
rename from rpcauth.c
rename to xdm/rpcauth.c
diff --git a/server.c b/xdm/server.c
similarity index 100%
rename from server.c
rename to xdm/server.c
diff --git a/session.c b/xdm/session.c
similarity index 100%
rename from session.c
rename to xdm/session.c
diff --git a/socket.c b/xdm/socket.c
similarity index 100%
rename from socket.c
rename to xdm/socket.c
diff --git a/streams.c b/xdm/streams.c
similarity index 100%
rename from streams.c
rename to xdm/streams.c
diff --git a/util.c b/xdm/util.c
similarity index 100%
rename from util.c
rename to xdm/util.c
diff --git a/xdmauth.c b/xdm/xdmauth.c
similarity index 100%
rename from xdmauth.c
rename to xdm/xdmauth.c
diff --git a/xdmcp.c b/xdm/xdmcp.c
similarity index 100%
rename from xdmcp.c
rename to xdm/xdmcp.c
--
1.6.0.4
More information about the xorg-devel
mailing list