diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2011-06-17 13:49:11 -0400 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2011-06-19 07:39:58 -0400 |
| commit | b0b9c21b752faab43241665f8fd12e10973e739c (patch) | |
| tree | 50f47fcf19a1c4f0058b7e632fc15b97ef7a7afd | |
| parent | 120a58116f2e3a223dbb78e0b33d3755eeb8ad5a (diff) | |
| download | xorg-app-xinit-b0b9c21b752faab43241665f8fd12e10973e739c.tar.gz | |
DIST_SUBDIRS is not required when using AM_CONDITIONALs
LAUNCHD is an Automake conditional which means that Automake will
traverse the launchd 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@videotron.ca>
| -rw-r--r-- | 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 |