For this package it is best not to break the pattern
of each directory having its own makefile.
Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
---
Makefile.am | 8 +++-----
app-defaults/Makefile.am | 1 +
configure.ac | 1 +
3 files changed, 5 insertions(+), 5 deletions(-)
create mode 100644 app-defaults/Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 90fc161..0bd7ca9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,13 +19,13 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
-SUBDIRS = chooser config greeter include man xdm xdmshell
+SUBDIRS = app-defaults chooser config greeter include man xdm xdmshell
+
+ACLOCAL_AMFLAGS = -I m4
# This ensures distcheck is performed in a location where user has write access
DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults
-dist_appdefault_DATA = app-defaults/Chooser
-
if LINT
ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS)
@@ -49,5 +49,3 @@ ChangeLog:
$(CHANGELOG_CMD)
dist-hook: ChangeLog INSTALL
-
-ACLOCAL_AMFLAGS = -I m4
diff --git a/app-defaults/Makefile.am b/app-defaults/Makefile.am
new file mode 100644
index 0000000..3f93873
--- /dev/null
+++ b/app-defaults/Makefile.am
@@ -0,0 +1 @@
+dist_appdefault_DATA = Chooser
diff --git a/configure.ac b/configure.ac
index dd90d51..41220d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -537,6 +537,7 @@ AC_SUBST(appdefaultdir)
AC_SUBST(MKTEMP_COMMAND)
AC_CONFIG_FILES([Makefile
+ app-defaults/Makefile
chooser/Makefile
config/Makefile
greeter/Makefile
--
1.6.0.4
_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
