camlib build var cleanup

Consistently use the same notation and formatting for all
camlib Makefile-files, which uses

  * common $(camlib_cflags)
  * common $(camlib_cppflags)
  * common $(camlib_dependencies)
  * common $(camlib_ldflags)
  * common $(camlib_libadd)

and then groups additional related definitions together,
making it obvious when e.g. bar_la_LIBADD adds FOO_LIBS
but bar_la_CPPFLAGS forgot to add FOO_CFLAGS.

2 files changed, 50 insertions, 25 deletions

diff --git a/camlibs/konica/Makefile-files b/camlibs/konica/Makefile-files
index 5d20d348f..ffd76aacd 100644
--- a/camlibs/konica/Makefile-files
+++ b/camlibs/konica/Makefile-files
@@ -1,29 +1,58 @@
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-SUBDIRS += konica/localization
 
-EXTRA_DIST += konica/EXPERTS konica/qm150.txt konica/README.konica konica/ChangeLog konica/COPYING konica/TODO
-camlibdoc_DATA += konica/README.konica
+konicalocalizationdir = $(datadir)/$(PACKAGE)/$(VERSION)/konica
 
-konica_defs = \
-	-DLOCALIZATION=\"$(datadir)/$(PACKAGE)/$(VERSION)/konica\"
+dist_konicalocalization_DATA =
+dist_konicalocalization_DATA += %reldir%/localization/english
+dist_konicalocalization_DATA += %reldir%/localization/french
+dist_konicalocalization_DATA += %reldir%/localization/german
+dist_konicalocalization_DATA += %reldir%/localization/japanese
+dist_konicalocalization_DATA += %reldir%/localization/korean
+dist_konicalocalization_DATA += %reldir%/localization/spanish
 
-EXTRA_LTLIBRARIES += konica.la
+konica_defs = -DLOCALIZATION=\"$(konicalocalizationdir)\"
 
-konica_la_SOURCES = \
-	konica/lowlevel.c konica/lowlevel.h \
-	konica/konica.c konica/konica.h \
-	konica/library.c
-konica_la_CPPFLAGS = $(AM_CPPFLAGS) $(konica_defs) $(CPPFLAGS)
-konica_la_LDFLAGS = $(camlib_ldflags)
-konica_la_DEPENDENCIES = $(camlib_dependencies)
-konica_la_LIBADD = $(camlib_libadd)
 
+EXTRA_DIST          += %reldir%/COPYING
+EXTRA_DIST          += %reldir%/ChangeLog
+EXTRA_DIST          += %reldir%/EXPERTS
+EXTRA_DIST          += %reldir%/TODO
+EXTRA_DIST          += %reldir%/qm150.txt
 
-EXTRA_LTLIBRARIES += konica_qm150.la
+EXTRA_DIST          += %reldir%/README.konica
+camlibdoc_DATA      += %reldir%/README.konica
 
-konica_qm150_la_SOURCES = konica/qm150.c
-konica_qm150_la_CPPFLAGS = $(AM_CPPFLAGS) $(konica_defs) $(CPPFLAGS) $(LIBEXIF_CFLAGS)
-konica_qm150_la_LDFLAGS = $(camlib_ldflags)
-konica_qm150_la_DEPENDENCIES = $(camlib_dependencies)
-konica_qm150_la_LIBADD = $(camlib_libadd) $(LIBEXIF_LIBS)
+
+EXTRA_LTLIBRARIES       += konica.la
+
+konica_la_SOURCES        =
+konica_la_SOURCES       += %reldir%/lowlevel.c
+konica_la_SOURCES       += %reldir%/lowlevel.h
+konica_la_SOURCES       += %reldir%/konica.c
+konica_la_SOURCES       += %reldir%/konica.h
+konica_la_SOURCES       += %reldir%/library.c
+
+konica_la_CFLAGS        = $(camlib_cflags)
+konica_la_CPPFLAGS      = $(camlib_cppflags)
+konica_la_DEPENDENCIES  = $(camlib_dependencies)
+konica_la_LDFLAGS       = $(camlib_ldflags)
+konica_la_LIBADD        = $(camlib_libadd)
+
+konica_la_CPPFLAGS     += $(konica_defs)
+
+
+EXTRA_LTLIBRARIES            += konica_qm150.la
+
+konica_qm150_la_SOURCES       = %reldir%/qm150.c
+
+konica_qm150_la_CFLAGS        = $(camlib_cflags)
+konica_qm150_la_CPPFLAGS      = $(camlib_cppflags)
+konica_qm150_la_DEPENDENCIES  = $(camlib_dependencies)
+konica_qm150_la_LDFLAGS       = $(camlib_ldflags)
+konica_qm150_la_LIBADD        = $(camlib_libadd)
+
+konica_qm150_la_CPPFLAGS     += $(konica_defs)
+
+konica_qm150_la_CPPFLAGS     += $(LIBEXIF_CFLAGS)
+konica_qm150_la_LIBADD       += $(LIBEXIF_LIBS)
diff --git a/camlibs/konica/localization/Makefile.am b/camlibs/konica/localization/Makefile.am
deleted file mode 100644
index 73f35be6a..000000000
--- a/camlibs/konica/localization/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-localizationdir = $(datadir)/$(PACKAGE)/$(VERSION)/konica
-localization_DATA = english french german japanese korean spanish
-
-EXTRA_DIST = $(localization_DATA)