[gegl-gtk] Clean up Makefile.am

[Daniel Sabo <daniels src gnome org>]

commit 5c65108aa5fc695d1fc86dbc6775cfd8c08359c8
Author: Daniel Sabo <DanielSabo gmail com>
Date:   Fri Nov 29 11:18:15 2013 -0800

    Clean up Makefile.am
    
    Make automake 1.13 happy and remove a bunch of unneeded wildcards.

 examples/.gitignore    |    4 ----
 examples/c/.gitignore  |    9 +++++++--
 examples/c/Makefile.am |   41 +++++++++++------------------------------
 gegl-gtk/Makefile.am   |    6 +++---
 operations/Makefile.am |   45 +++++++++------------------------------------
 5 files changed, 30 insertions(+), 75 deletions(-)
---
diff --git a/examples/.gitignore b/examples/.gitignore
index 944a61e..e69de29 100644
--- a/examples/.gitignore
+++ b/examples/.gitignore
@@ -1,4 +0,0 @@
-gegl-gtk-paint
-gegl-gtk-basic
-gegl-gtk-display-op
-gegl-gtk-warp
diff --git a/examples/c/.gitignore b/examples/c/.gitignore
index 81c2fa4..265da8e 100644
--- a/examples/c/.gitignore
+++ b/examples/c/.gitignore
@@ -1,2 +1,7 @@
-gegl-gtk-scroll
-gegl-gtk-transform
+/*.o
+/gegl-gtk-basic
+/gegl-gtk-display-op
+/gegl-gtk-paint
+/gegl-gtk-scroll
+/gegl-gtk-transform
+/gegl-gtk-warp
\ No newline at end of file
diff --git a/examples/c/Makefile.am b/examples/c/Makefile.am
index 856c976..7be48e8 100644
--- a/examples/c/Makefile.am
+++ b/examples/c/Makefile.am
@@ -1,32 +1,13 @@
-
-CFILES = $(wildcard $(srcdir)/*.c)
-bins   = $(subst $(srcdir)/,,$(CFILES:.c=))
-EXTRA_DIST = $(wildcard *.c) $(wildcard util/*.[ch])
-
-gegl_lt_cc_v = $(gegl_lt_cc_v_$(V))
-gegl_lt_cc_v_ = $(gegl_lt_cc_v_$(AM_DEFAULT_VERBOSITY))
-gegl_lt_cc_v_0 = @echo "  CC     " $<;
-gegl_lt_ccld_v = $(gegl_lt_ccld_v_$(V))
-gegl_lt_ccld_v_ = $(gegl_lt_ccld_v_$(AM_DEFAULT_VERBOSITY))
-gegl_lt_ccld_v_0 = @echo "  CCLD   " $@;
-
-AM_CPPFLAGS = \
-       -I$(top_srcdir)/gegl-gtk
-
-CFLAGS = $(GTK_CFLAGS) $(GEGL_CFLAGS)
-
 libgeglgtk = $(top_builddir)/gegl-gtk/libgegl-gtk$(GEGL_GTK_GTK_VERSION)-$(GEGL_GTK_API_VERSION).la
 
-LIBS =  \
-       $(GTK_LIBS) $(GEGL_LIBS) $(libgeglgtk)
-
-all-local: $(bins)
-
-%: %.c $(GEGLHEADERS)
-       $(gegl_lt_cc_v) $(LIBTOOL) --quiet --tag=CC --mode=compile $(CC) $(DEFS) -I. -I$(top_builddir) 
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o $  lo $< 
-       $(gegl_lt_ccld_v) $(LIBTOOL) --quiet --tag=CC --mode=link $(CC) $(AM_LDFLAGS) $(LDFLAGS) $(CFLAGS) -o 
$@ $  lo $(LIBS)
-
-clean-local:
-       rm -f *.lo $(bins)
-
-
+LIBS = $(GTK_LIBS) $(GEGL_LIBS) $(libgeglgtk)
+AM_CPPFLAGS = -I$(top_srcdir)/gegl-gtk
+AM_CFLAGS = $(GTK_CFLAGS) $(GEGL_CFLAGS)
+
+bin_PROGRAMS = \
+       gegl-gtk-basic \
+       gegl-gtk-display-op \
+       gegl-gtk-paint \
+       gegl-gtk-scroll \
+       gegl-gtk-transform \
+       gegl-gtk-warp
diff --git a/gegl-gtk/Makefile.am b/gegl-gtk/Makefile.am
index 703df21..b823646 100644
--- a/gegl-gtk/Makefile.am
+++ b/gegl-gtk/Makefile.am
@@ -10,7 +10,7 @@ BUILT_SOURCES = $(gen_headers)
 
 headers = gegl-gtk.h gegl-gtk-view.h gegl-gtk-enums.h
 sources = gegl-gtk-view.c $(gen_sources)
-INCLUDES = $(GTK_CFLAGS) $(GEGL_CFLAGS)
+AM_CFLAGS = $(GTK_CFLAGS) $(GEGL_CFLAGS)
 
 internal_headers = internal/view-helper.h
 internal_sources = internal/view-helper.c
@@ -22,7 +22,7 @@ lib_LTLIBRARIES = libgegl-gtk GEGL_GTK_GTK_VERSION@-0.1.la
 
 libgegl_gtk GEGL_GTK_GTK_VERSION@_0_1_la_SOURCES = $(headers)  $(gen_headers) $(sources) $(internal_headers) 
$(internal_sources)
 libgegl_gtk GEGL_GTK_GTK_VERSION@_0_1_la_LIBADD = $(GTK_LIBS) $(GEGL_LIBS) $(CAIRO_GOBJECT_LIBS)
-libgegl_gtk GEGL_GTK_GTK_VERSION@_0_1_la_CFLAGS = $(INCLUDES) $(CFLAGS)
+libgegl_gtk GEGL_GTK_GTK_VERSION@_0_1_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS)
 libgegl_gtk GEGL_GTK_GTK_VERSION@_0_1_la_LDFLAGS = $(gegl_gtk_LDFLAGS) -version-info 
$(GEGL_GTK_LIBRARY_VERSION)
 
 gegl-gtk-enums.c: $(srcdir)/gegl-gtk-enums.h
@@ -67,7 +67,7 @@ if HAVE_INTROSPECTION
 
 GeglGtk GEGL_GTK_GTK_VERSION@- GEGL_GTK_API_VERSION@.gir: libgegl-gtk GEGL_GTK_GTK_VERSION@- 
GEGL_GTK_API_VERSION@.la Makefile
 
-GeglGtk GEGL_GTK_GTK_VERSION@_0_1_gir_CFLAGS = $(INCLUDES)
+GeglGtk GEGL_GTK_GTK_VERSION@_0_1_gir_CFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS)
 GeglGtk GEGL_GTK_GTK_VERSION@_0_1_gir_FILES = $(sources) $(headers)
 GeglGtk GEGL_GTK_GTK_VERSION@_0_1_gir_LIBS = libgegl-gtk GEGL_GTK_GTK_VERSION@- GEGL_GTK_API_VERSION@.la
 GeglGtk GEGL_GTK_GTK_VERSION@_0_1_gir_INCLUDES = Gtk- GEGL_GTK_GTK_VERSION@.0 Gegl-0.3
diff --git a/operations/Makefile.am b/operations/Makefile.am
index ecc5b96..64e12af 100644
--- a/operations/Makefile.am
+++ b/operations/Makefile.am
@@ -1,41 +1,14 @@
-
-ext_dir = $(GEGL_PLUGINS_DIR)
 libgeglgtk = $(top_builddir)/gegl-gtk/libgegl-gtk$(GEGL_GTK_GTK_VERSION)-$(GEGL_GTK_API_VERSION).la
 
-op_LIBS            = $(GTK_LIBS) $(GEGL_LIBS) $(libgeglgtk)
-op_CFLAGS                      = $(GTK_CFLAGS) $(GEGL_CFLAGS)
-op_LDFLAGS                     = -avoid-version -export-dynamic -module
-
-CFILES          = $(wildcard $(srcdir)/*.c)
-plugins         = $(subst gegl-gtk-,gegl-gtk GEGL_GTK_GTK_VERSION@-, $(subst $(srcdir)/,,$(CFILES:.c=.la)))
-INSTALLED_ITEMS = $(subst gegl-gtk-,gegl-gtk GEGL_GTK_GTK_VERSION@-, $(subst 
$(srcdir)/,$(ext_dir)/,$(CFILES:.c=$(SHREXT))))
-EXTRA_DIST      = $(wildcard *.c) $(wildcard *.h)
-
-gegl_lt_cc_v = $(gegl_lt_cc_v_$(V))
-gegl_lt_cc_v_ = $(gegl_lt_cc_v_$(AM_DEFAULT_VERBOSITY))
-gegl_lt_cc_v_0 = @echo "  CC     " $<;
-gegl_lt_ccld_v = $(gegl_lt_ccld_v_$(V))
-gegl_lt_ccld_v_ = $(gegl_lt_ccld_v_$(AM_DEFAULT_VERBOSITY))
-gegl_lt_ccld_v_0 = @echo "  CCLD   " $@;
-
-all-local: $(plugins)
-
-gegl-gtk GEGL_GTK_GTK_VERSION@-%.la: gegl-gtk-%.c
-       $(gegl_lt_cc_v) $(LIBTOOL) --quiet --tag=CC --mode=compile $(CC) $(DEFS) -I. -I$(top_builddir) 
-I$(top_srcdir)/gegl-gtk -I$(srcdir) $(AM_CPPFLAGS) $(CPPFLAGS) $(op_CFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o $  
lo $<
-       $(gegl_lt_ccld_v) $(LIBTOOL) --quiet --tag=CC --mode=link $(CC) $(AM_LDFLAGS) $(op_LDFLAGS) 
$(op_CFLAGS) $(CFLAGS) -o $@ -rpath $(ext_dir) $  lo $(op_LIBS) $(MATH_LIB)
-
-clean-local:
-       rm -f *.la
+ops =
 
-install-exec-local: all-local
-       $(INSTALL) -d $(DESTDIR)$(ext_dir)
-       for i in $(plugins); do \
-         $(LIBTOOL) --mode=install $(INSTALL) $$i $(DESTDIR)$(ext_dir) ; \
-       done
+AM_LIBS = $(GTK_LIBS) $(GEGL_LIBS) $(libgeglgtk)
+AM_CPPFLAGS = -I. -I$(top_builddir) -I$(top_srcdir)/gegl-gtk -I$(srcdir)
+AM_CFLAGS = $(GTK_CFLAGS) $(GEGL_CFLAGS)
+AM_LDFLAGS = -avoid-version -export-dynamic -module
 
-uninstall-local:
-       for i in $(plugins); do \
-         $(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(ext_dir)/$$i ; \
-       done
+gegl_ GEGL_GTK_GTK_VERSION@_display_la_SOURCES = gegl-gtk-display.c
+ops += gegl- GEGL_GTK_GTK_VERSION@-display.la
 
-check-local: all-local
+opdir = $(GEGL_PLUGINS_DIR)
+op_LTLIBRARIES = $(ops)