[PATCH libinputmapper 13/13] Makefile: clean up a bunch of variables

[David Herrmann]

Hi

On Wed, Aug 28, 2013 at 3:00 AM, Peter Hutterer
<peter.hutterer at who-t.net> wrote:
> Instead of defining all of them empty, then adding the actual content to it,
> just define it once with the content.

It's copied from a bigger project with several conditional builds.
There I prefer using "+=" instead of just "=". But I guess inputmapper
will stay small so it's fine to do it this way.

Thanks
David

> Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
> ---
>  Makefile.am | 21 ++++-----------------
>  1 file changed, 4 insertions(+), 17 deletions(-)
>
> diff --git a/Makefile.am b/Makefile.am
> index 85c5e20..d35000a 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -20,7 +20,6 @@ AM_MAKEFLAGS = --no-print-directory
>
>  .DELETE_ON_ERROR:
>
> -include_HEADERS =
>  EXTRA_DIST = \
>         README \
>         COPYING \
> @@ -29,13 +28,8 @@ EXTRA_DIST = \
>         src/libinputmapper.sym
>  CLEANFILES =
>  pkgconfigdir = $(libdir)/pkgconfig
> -pkgconfig_DATA =
>  TPHONY =
>
> -check_PROGRAMS =
> -lib_LTLIBRARIES =
> -noinst_LTLIBRARIES =
> -
>  #
>  # Default CFlags
>  # Make all files include "config.h" by default. This shouldn't cause any
> @@ -69,9 +63,9 @@ AM_LDFLAGS = \
>  # Main library build instructions
>  #
>
> -lib_LTLIBRARIES += libinputmapper.la
> -include_HEADERS += src/libinputmapper.h
> -pkgconfig_DATA += src/libinputmapper.pc
> +lib_LTLIBRARIES = libinputmapper.la
> +include_HEADERS = src/libinputmapper.h
> +pkgconfig_DATA = src/libinputmapper.pc
>
>  libinputmapper_la_SOURCES = \
>         src/libinputmapper.h \
> @@ -103,7 +97,7 @@ doxygen: docs/libinputmapper.doxygen
>  clean-local:
>         rm -rf docs/html
>
> -TPHONY += doxygen
> +.PHONY: doxygen
>
>  doc_src = $(shell find docs/html -name "*" -printf "docs/html/%P\n")
>  EXTRA_DIST += $(doc_src) docs/libinputmapper.doxygen
> @@ -111,13 +105,6 @@ dist_noinst_DATA = docs/libinputmapper.doxygen.in
>
>  endif
>
> -
> -#
> -# Phony targets
> -#
> -
> -.PHONY: $(TPHONY)
> -
>  #
>  # Empty .SECONDARY target causes alle intermediate files to be treated as
>  # secondary files. That is, they don't get deleted after make finished.
> --
> 1.8.2.1
>
> _______________________________________________
> Input-tools mailing list
> Input-tools at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/input-tools