[PATCH app-xinit 3/3] DIST_SUBDIRS is not required when using AM_CONDITIONALs
Gaetan Nadon
memsize at videotron.ca
Fri Jun 17 11:29:56 PDT 2011
LAUNCHD is an Automake conditional which means that Automake will
traverse the privileged_startx directory when running the dist target.
http://www.gnu.org/software/automake/manual/automake.html
One less variables to maintain.
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
Makefile.am | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index c179fa9..3867bea 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,11 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
+SUBDIRS = man
+if LAUNCHD
+SUBDIRS += launchd
+endif
+
bin_PROGRAMS = xinit
bin_SCRIPTS = startx
@@ -50,13 +55,6 @@ CPP_FILES_FLAGS = \
-D__bindir__="$(bindir)" \
-DBUNDLE_ID_PREFIX="$(bundleidprefix)"
-SUBDIRS = man
-if LAUNCHD
-SUBDIRS += launchd
-endif
-
-DIST_SUBDIRS = launchd man
-
xinitrc_DATA = xinitrc
MAINTAINERCLEANFILES = ChangeLog INSTALL
--
1.7.4.1
More information about the xorg-devel
mailing list