[PATCH app-bitmap 2/4] make: reshuffle lines and shorten the makefile

[Alan Coopersmith]

Gaetan Nadon wrote:
> The previous patch did some aesthetic damage to it.
> 
> Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
> ---
>  Makefile.am |   56 ++++++++++++++++++++------------------------------------
>  1 files changed, 20 insertions(+), 36 deletions(-)
> 
> diff --git a/Makefile.am b/Makefile.am
> index 9afde64..6771ce9 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -22,11 +22,8 @@
>  SUBDIRS=man
>  bin_PROGRAMS = bitmap bmtoa atobm
>  
> -# bitmap
> -
>  bitmap_CFLAGS = $(CWARNFLAGS) $(BITMAP_CFLAGS)
>  bitmap_LDADD = $(BITMAP_LIBS) -lm
> -
>  bitmap_SOURCES = \
>           BitEdit.c \
>           CutPaste.c \
> @@ -40,48 +37,17 @@ bitmap_SOURCES = \
>           Dialog.h \
>           Requests.h
>  
> -# bmtoa
> -
>  bmtoa_CFLAGS = $(CWARNFLAGS) $(BMTOA_CFLAGS)
>  bmtoa_LDADD = $(BMTOA_LIBS)
> -bmtoa_SOURCES = \
> -         bmtoa.c
> -
> -# atobm
> +bmtoa_SOURCES = bmtoa.c
>  
>  atobm_CFLAGS = $(CWARNFLAGS) $(ATOBM_CFLAGS)
>  atobm_LDADD = $(ATOBM_LDADD)
> -atobm_SOURCES = \
> -         atobm.c
> -
> -# App default files  (*.ad)
> -
> -DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults
> -
> -appdefaultdir = @appdefaultdir@
> -
> -dist_appdefault_DATA = \
> -	app-defaults/Bitmap-color \
> -	app-defaults/Bitmap-nocase \
> -	app-defaults/Bitmap
> -
> +atobm_SOURCES = atobm.c
>  
>  EXTRA_DIST = bitmap.icon autogen.sh
>  
> -.PHONY: ChangeLog INSTALL
> -
> -INSTALL:
> -	$(INSTALL_CMD)
> -
> -ChangeLog:
> -	$(CHANGELOG_CMD)
> -
> -dist-hook: ChangeLog INSTALL
> -
> -# bitmaps
> -
>  bitmapdir = $(includedir)/X11/bitmaps
> -
>  dist_bitmap_DATA =	\
>  	Dashes		\
>  	Down		\
> @@ -97,5 +63,23 @@ dist_bitmap_DATA =	\
>  	Term		\
>  	Up
>  
> +# App default files  (*.ad)
> +DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults
> +
> +appdefaultdir = @appdefaultdir@
> +dist_appdefault_DATA = \
> +	app-defaults/Bitmap-color \
> +	app-defaults/Bitmap-nocase \
> +	app-defaults/Bitmap
> +
>  MAINTAINERCLEANFILES = ChangeLog INSTALL
>  
> +.PHONY: ChangeLog INSTALL
> +
> +INSTALL:
> +	$(INSTALL_CMD)
> +
> +ChangeLog:
> +	$(CHANGELOG_CMD)
> +
> +dist-hook: ChangeLog INSTALL

Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>

-- 
	-Alan Coopersmith-        alan.coopersmith at oracle.com
	 Oracle Solaris Platform Engineering: X Window System