[gegl] Removed wildcard rules from operations Makefiles



commit 0df497a1afdde4bd28d0f99873757c0ce3490a80
Author: Daniel Sabo <DanielSabo gmail com>
Date:   Fri Nov 29 13:05:33 2013 -0800

    Removed wildcard rules from operations Makefiles
    
    The custom rules prevented automake's dependency tracking from
    working, which was generally annoying and made using opencl/*.cl.h
    much more painful than necessary.

 operations/Makefile-common.am             |    8 +--
 operations/Makefile-operations.am         |   39 ----------
 operations/Makefile.am                    |    5 +-
 operations/common/Makefile.am             |  117 ++++++++++++++++++++++++++++-
 operations/core/Makefile.am               |   16 +++-
 operations/generated/Makefile.am          |   40 +++++++++-
 operations/workshop/Makefile.am           |   30 +++++++-
 operations/workshop/generated/Makefile.am |   17 ++++-
 8 files changed, 209 insertions(+), 63 deletions(-)
---
diff --git a/operations/Makefile-common.am b/operations/Makefile-common.am
index 4bc4665..a4c2558 100644
--- a/operations/Makefile-common.am
+++ b/operations/Makefile-common.am
@@ -2,13 +2,9 @@ if PLATFORM_WIN32
 no_undefined = -no-undefined
 endif
 
-libgegl = $(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la $(BABL_LIBS)
+libgegl = $(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la
 
-op_libs = $(DEP_LIBS) $(libgegl)
-
-GEGLHEADERS     = $(wildcard $(top_srcdir)/gegl/*.h)\
-                  $(wildcard $(top_srcdir)/gegl/buffer/*.h)\
-                  $(wildcard $(top_srcdir)/gegl/opencl/*.h)
+op_libs = $(DEP_LIBS) $(BABL_LIBS) $(libgegl)
 
 AM_CPPFLAGS = \
        -I$(top_srcdir) \
diff --git a/operations/Makefile.am b/operations/Makefile.am
index d89f9fe..8c63bf5 100644
--- a/operations/Makefile.am
+++ b/operations/Makefile.am
@@ -7,9 +7,8 @@ SUBDIRS = \
        external
 
 if ENABLE_WORKSHOP
-SUBDIRS+= workshop
+SUBDIRS += workshop
 endif
 
-EXTRA_DIST= \
-       Makefile-operations.am  \
+EXTRA_DIST = \
        Makefile-common.am
diff --git a/operations/common/Makefile.am b/operations/common/Makefile.am
index d0ab652..13a072d 100644
--- a/operations/common/Makefile.am
+++ b/operations/common/Makefile.am
@@ -1,7 +1,116 @@
 SUBDIRS = perlin
 
-include $(top_srcdir)/operations/Makefile-operations.am
+include $(top_srcdir)/operations/Makefile-common.am
 
-AM_CPPFLAGS += \
-       -I$(top_srcdir) \
-       -I$(top_srcdir)/operations/common
+EXTRA_DIST = $(wildcard $(srcdir)/*.h)
+
+AM_CPPFLAGS += -I$(srcdir)
+
+LIBS = $(op_libs)
+
+opdir = $(ext_dir)
+op_LTLIBRARIES = \
+       alien-map.la \
+       antialias.la \
+       bilateral-filter-fast.la \
+       bilateral-filter.la \
+       box-blur.la \
+       brightness-contrast.la \
+       buffer-sink.la \
+       buffer-source.la \
+       bump-map.la \
+       c2g.la \
+       cartoon.la \
+       channel-mixer.la \
+       checkerboard.la \
+       color-reduction.la \
+       color-temperature.la \
+       color-to-alpha.la \
+       color.la \
+       contrast-curve.la \
+       cubism.la \
+       deinterlace.la \
+       difference-of-gaussians.la \
+       display.la \
+       dropshadow.la \
+       edge-laplace.la \
+       edge-sobel.la \
+       emboss.la \
+       exp-combine.la \
+       exposure.la \
+       fattal02.la \
+       fractal-explorer.la \
+       fractal-trace.la \
+       gaussian-blur.la \
+       gegl-buffer-load-op.la \
+       gegl-buffer-save-op.la \
+       grey.la \
+       grid.la \
+       high-pass.la \
+       image-compare.la \
+       introspect.la \
+       invert-gamma.la \
+       invert-linear.la \
+       layer.la \
+       lens-distortion.la \
+       levels.la \
+       load.la \
+       magick-load.la \
+       mantiuk06.la \
+       map-absolute.la \
+       map-relative.la \
+       matting-global.la \
+       mblur.la \
+       mirrors.la \
+       mono-mixer.la \
+       mosaic.la \
+       motion-blur-circular.la \
+       motion-blur-linear.la \
+       motion-blur-zoom.la \
+       noise-cie-lch.la \
+       noise-hsv.la \
+       noise-hurl.la \
+       noise-pick.la \
+       noise-reduction.la \
+       noise-rgb.la \
+       noise-slur.la \
+       noise-spread.la \
+       noise.la \
+       oilify.la \
+       opacity.la \
+       open-buffer.la \
+       over.la \
+       photocopy.la \
+       pixelize.la \
+       plasma.la \
+       polar-coordinates.la \
+       posterize.la \
+       raw-load.la \
+       rectangle.la \
+       red-eye-removal.la \
+       reinhard05.la \
+       remap.la \
+       ripple.la \
+       save.la \
+       shift.la \
+       snn-mean.la \
+       softglow.la \
+       stress.la \
+       stretch-contrast-hsv.la \
+       stretch-contrast.la \
+       svg-huerotate.la \
+       svg-luminancetoalpha.la \
+       svg-matrix.la \
+       svg-saturate.la \
+       threshold.la \
+       tile-seamless.la \
+       tile.la \
+       unsharp-mask.la \
+       value-invert.la \
+       vignette.la \
+       warp.la \
+       waves.la \
+       weighted-blend.la \
+       whirl-pinch.la \
+       wind.la \
+       write-buffer.la
\ No newline at end of file
diff --git a/operations/core/Makefile.am b/operations/core/Makefile.am
index 21bb6b2..378553f 100644
--- a/operations/core/Makefile.am
+++ b/operations/core/Makefile.am
@@ -1,4 +1,14 @@
-include $(top_srcdir)/operations/Makefile-operations.am
+include $(top_srcdir)/operations/Makefile-common.am
 
-AM_CPPFLAGS += \
-       -I$(top_srcdir)/operations/core
+EXTRA_DIST = $(wildcard $(srcdir)/*.h)
+
+AM_CPPFLAGS += -I$(srcdir)
+
+LIBS = $(op_libs)
+
+opdir = $(ext_dir)
+op_LTLIBRARIES = \
+       clone.la \
+       convert-format.la \
+       crop.la \
+       nop.la
\ No newline at end of file
diff --git a/operations/generated/Makefile.am b/operations/generated/Makefile.am
index 83dd047..97c8fae 100644
--- a/operations/generated/Makefile.am
+++ b/operations/generated/Makefile.am
@@ -1,6 +1,38 @@
-include $(top_srcdir)/operations/Makefile-operations.am
+include $(top_srcdir)/operations/Makefile-common.am
 
-AM_CPPFLAGS += \
-       -I$(top_srcdir)/operations/generated
+EXTRA_DIST = $(wildcard $(srcdir)/*.rb) $(wildcard $(srcdir)/*.h)
 
-EXTRA_DIST += $(wildcard $(srcdir)/*.rb) $(wildcard $(srcdir)/*.c)
+AM_CPPFLAGS += -I$(srcdir)
+
+LIBS = $(op_libs)
+
+opdir = $(ext_dir)
+op_LTLIBRARIES = \
+  add.la \
+  clear.la \
+  color-burn.la \
+  color-dodge.la \
+  darken.la \
+  difference.la \
+  divide.la \
+  dst-atop.la \
+  dst-in.la \
+  dst-out.la \
+  dst-over.la \
+  dst.la \
+  exclusion.la \
+  gamma.la \
+  hard-light.la \
+  lighten.la \
+  multiply.la \
+  overlay.la \
+  plus.la \
+  screen.la \
+  soft-light.la \
+  src-atop.la \
+  src-in.la \
+  src-out.la \
+  src.la \
+  subtract.la \
+  svg-multiply.la \
+  xor.la
\ No newline at end of file
diff --git a/operations/workshop/Makefile.am b/operations/workshop/Makefile.am
index fbb2982..d770a39 100644
--- a/operations/workshop/Makefile.am
+++ b/operations/workshop/Makefile.am
@@ -1,2 +1,30 @@
 SUBDIRS = generated external
-include $(top_srcdir)/operations/Makefile-operations.am
+
+include $(top_srcdir)/operations/Makefile-common.am
+
+EXTRA_DIST = $(wildcard $(srcdir)/*.h)
+
+AM_CPPFLAGS += -I$(srcdir)
+
+LIBS = $(op_libs)
+
+opdir = $(ext_dir)
+op_LTLIBRARIES =    \
+       box-max.la \
+       box-min.la \
+       box-percentile.la \
+       buffer-cache.la \
+       color-rotate.la \
+       convolution-matrix.la \
+       demosaic-bimedian.la \
+       demosaic-simple.la \
+       disc-percentile.la \
+       ditto.la \
+       hstack.la \
+       kuwahara.la \
+       linear-gradient.la \
+       mandelbrot.la \
+       radial-gradient.la \
+       rawbayer-load.la \
+       snn-percentile.la \
+       unpremul.la
diff --git a/operations/workshop/generated/Makefile.am b/operations/workshop/generated/Makefile.am
index 76aef18..b9c59c6 100644
--- a/operations/workshop/generated/Makefile.am
+++ b/operations/workshop/generated/Makefile.am
@@ -1,5 +1,16 @@
-include $(top_srcdir)/operations/Makefile-operations.am
+include $(top_srcdir)/operations/Makefile-common.am
 
-AM_CPPFLAGS += -I$(top_srcdir)/operations/workshop/generated
+EXTRA_DIST = $(wildcard $(srcdir)/*.rb) $(wildcard $(srcdir)/*.h)
 
-EXTRA_DIST += $(wildcard $(srcdir)/*.rb) $(wildcard $(srcdir)/*.c)
+AM_CPPFLAGS += -I$(srcdir)
+
+LIBS = $(op_libs)
+
+opdir = $(ext_dir)
+op_LTLIBRARIES = \
+       average.la \
+       blend-reflect.la \
+       negation.la \
+       soft-burn.la \
+       soft-dodge.la \
+       subtractive.la
\ No newline at end of file


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]