[pkg-fso-commits] [nodm] 26/50: upstream: Makefile.am: line-wrap variable assignments with file lists.
Mike Gabriel
sunweaver at debian.org
Mon Jan 23 15:19:32 UTC 2017
This is an automated email from the git hooks/post-receive script.
sunweaver pushed a commit to branch master
in repository nodm.
commit 96ac160373a0281a2fa3e98c3a28f46641c628d5
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Wed Mar 23 15:06:23 2016 +0100
upstream: Makefile.am: line-wrap variable assignments with file lists.
---
Makefile.am | 50 +++++++++++++++++++++++++++++++++++++++++---------
debian/changelog | 1 +
2 files changed, 42 insertions(+), 9 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 05056b9..ce21e91 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,37 +1,69 @@
## Process this file with automake to produce Makefile.in
+NULL =
+
CFLAGS += -Wall -Werror
ACLOCAL_AMFLAGS = -I m4
sbin_PROGRAMS = nodm
-dist_noinst_HEADERS = common.h dm.h log.h test.h vt.h xserver.h xsession.h xsession-child.h
+dist_noinst_HEADERS = common.h \
+ dm.h \
+ log.h \
+ test.h \
+ vt.h \
+ xserver.h \
+ xsession.h \
+ xsession-child.h \
+ $(NULL)
+
+libsources = common.c \
+ log.c \
+ vt.c \
+ xsession-child.c \
+ xserver.c \
+ xsession.c dm.c \
+ $(NULL)
-libsources = common.c log.c vt.c xsession-child.c xserver.c xsession.c dm.c
-testlibsources = $(libsources) test.c
+testlibsources = $(libsources) \
+ test.c \
+ $(NULL)
AM_CPPFLAGS = $(X11_CFLAGS)
LIBS = $(PAM_LIBS) $(X11_LIBS)
-nodm_SOURCES = $(libsources) nodm.c
+nodm_SOURCES = $(libsources) \
+ nodm.c \
+ $(NULL)
+
nodm_CFLAGS = -DNODM_SESSION='"$(sbindir)/nodm"'
nodm.8: nodm
help2man --section=8 --name="X display manager for automatic logins" \
--no-info --include=nodm-man-extras ./$< > $@
-man_MANS = nodm.8
+man_MANS = nodm.8 \
+ $(NULL)
TESTS = test-internals test-xstart test-xsession
check_PROGRAMS = test-internals test-xstart test-xsession
-test_xstart_SOURCES = $(testlibsources) test-xstart.c
+test_xstart_SOURCES = $(testlibsources) \
+ test-xstart.c \
+ $(NULL)
-test_xsession_SOURCES = $(testlibsources) test-xsession.c
+test_xsession_SOURCES = $(testlibsources) \
+ test-xsession.c \
+ $(NULL)
-test_internals_SOURCES = $(testlibsources) test-internals.c
+test_internals_SOURCES = $(testlibsources) \
+ test-internals.c \
+ $(NULL)
-EXTRA_DIST = test_nodm nodm-man-extras autogen.sh
+EXTRA_DIST = test_nodm \
+ nodm-man-extras \
+ autogen.sh \
+ $(NULL)
CLEANFILES = nodm.8
diff --git a/debian/changelog b/debian/changelog
index a6ad9c9..db325cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ nodm (0.12-1) UNRELEASED; urgency=low
- README.md: Fix miscounting of amount of environment variables. (Closes:
#746700). Thanks to Dan Jacobson for pointing this out.
- Drop .gitignore file. Let's rather provide a working make (dist)clean.
+ - Makefile.am: line-wrap variable assignments with file lists.
* debian/control:
+ Process with wrap-and-sort.
+ Bump Standards: to 3.9.7. Required change: DEP-5 compliant copyright file.
--
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-fso/nodm.git
More information about the pkg-fso-commits
mailing list