From 96038ff8e4f11159f9e9be61d0e3c23c4db89a92 Mon Sep 17 00:00:00 2001 From: Christian Thaeter Date: Thu, 19 Apr 2007 06:32:26 +0200 Subject: [PATCH] remaining plugins with simple fixes --- plugins/Makefile.am | 32 ++++++++++++++++---------------- plugins/aging/Makefile.am | 2 +- plugins/burn/Makefile.am | 4 ++-- plugins/denoisefft/Makefile.am | 2 +- plugins/diffkey/Makefile.am | 2 +- plugins/dot/Makefile.am | 4 ++-- plugins/histogram/Makefile.am | 2 +- plugins/holo/Makefile.am | 4 ++-- plugins/parametric/Makefile.am | 2 +- plugins/pitch/Makefile.am | 2 +- plugins/shapewipe/Makefile.am | 2 +- plugins/spectrogram/Makefile.am | 2 +- plugins/timefront/Makefile.am | 2 +- plugins/timestretch/Makefile.am | 2 +- plugins/titler/Makefile.am | 2 +- plugins/videoscope/Makefile.am | 2 +- 16 files changed, 34 insertions(+), 34 deletions(-) diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 7dc6fcf2..e863c038 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -9,14 +9,14 @@ include $(top_srcdir)/plugins/defaulttheme/Makefile.am include $(top_srcdir)/plugins/libfourier/Makefile.am include $(top_srcdir)/plugins/colors/Makefile.am include $(top_srcdir)/plugins/libeffecttv/Makefile.am -#include $(top_srcdir)/plugins/1080to540/Makefile.am -#include $(top_srcdir)/plugins/720to480/Makefile.am +include $(top_srcdir)/plugins/1080to540/Makefile.am +include $(top_srcdir)/plugins/720to480/Makefile.am include $(top_srcdir)/plugins/aging/Makefile.am include $(top_srcdir)/plugins/bandslide/Makefile.am include $(top_srcdir)/plugins/bandwipe/Makefile.am include $(top_srcdir)/plugins/blur/Makefile.am include $(top_srcdir)/plugins/brightness/Makefile.am -#include $(top_srcdir)/plugins/burn/Makefile.am +include $(top_srcdir)/plugins/burn/Makefile.am include $(top_srcdir)/plugins/cdripper/Makefile.am include $(top_srcdir)/plugins/chromakey/Makefile.am #include $(top_srcdir)/plugins/chromakeyhsv/Makefile.am @@ -28,14 +28,14 @@ include $(top_srcdir)/plugins/deinterlace/Makefile.am include $(top_srcdir)/plugins/delayaudio/Makefile.am include $(top_srcdir)/plugins/delayvideo/Makefile.am include $(top_srcdir)/plugins/denoise/Makefile.am -#include $(top_srcdir)/plugins/denoisefft/Makefile.am +include $(top_srcdir)/plugins/denoisefft/Makefile.am include $(top_srcdir)/plugins/denoisemjpeg/Makefile.am include $(top_srcdir)/plugins/denoiseseltempavg/Makefile.am include $(top_srcdir)/plugins/denoisevideo/Makefile.am include $(top_srcdir)/plugins/despike/Makefile.am -#include $(top_srcdir)/plugins/diffkey/Makefile.am +include $(top_srcdir)/plugins/diffkey/Makefile.am include $(top_srcdir)/plugins/dissolve/Makefile.am -#include $(top_srcdir)/plugins/dot/Makefile.am +include $(top_srcdir)/plugins/dot/Makefile.am include $(top_srcdir)/plugins/downsample/Makefile.am include $(top_srcdir)/plugins/fieldframe/Makefile.am include $(top_srcdir)/plugins/flash/Makefile.am @@ -46,8 +46,8 @@ include $(top_srcdir)/plugins/freezeframe/Makefile.am include $(top_srcdir)/plugins/gain/Makefile.am include $(top_srcdir)/plugins/gamma/Makefile.am include $(top_srcdir)/plugins/gradient/Makefile.am -#include $(top_srcdir)/plugins/histogram/Makefile.am -#include $(top_srcdir)/plugins/holo/Makefile.am +include $(top_srcdir)/plugins/histogram/Makefile.am +include $(top_srcdir)/plugins/holo/Makefile.am include $(top_srcdir)/plugins/huesaturation/Makefile.am include $(top_srcdir)/plugins/interpolate/Makefile.am include $(top_srcdir)/plugins/interpolateaudio/Makefile.am @@ -68,9 +68,9 @@ include $(top_srcdir)/plugins/normalize/Makefile.am include $(top_srcdir)/plugins/oilpainting/Makefile.am include $(top_srcdir)/plugins/overlay/Makefile.am include $(top_srcdir)/plugins/overlayaudio/Makefile.am -#include $(top_srcdir)/plugins/parametric/Makefile.am +include $(top_srcdir)/plugins/parametric/Makefile.am #include $(top_srcdir)/plugins/perspective/Makefile.am -#include $(top_srcdir)/plugins/pitch/Makefile.am +include $(top_srcdir)/plugins/pitch/Makefile.am include $(top_srcdir)/plugins/polar/Makefile.am #include $(top_srcdir)/plugins/radialblur/Makefile.am include $(top_srcdir)/plugins/reframe/Makefile.am @@ -82,22 +82,22 @@ include $(top_srcdir)/plugins/reversevideo/Makefile.am include $(top_srcdir)/plugins/rgb601/Makefile.am #include $(top_srcdir)/plugins/rotate/Makefile.am include $(top_srcdir)/plugins/scale/Makefile.am -#include $(top_srcdir)/plugins/shapewipe/Makefile.am +include $(top_srcdir)/plugins/shapewipe/Makefile.am include $(top_srcdir)/plugins/sharpen/Makefile.am include $(top_srcdir)/plugins/shiftinterlace/Makefile.am include $(top_srcdir)/plugins/slide/Makefile.am -#include $(top_srcdir)/plugins/spectrogram/Makefile.am +include $(top_srcdir)/plugins/spectrogram/Makefile.am include $(top_srcdir)/plugins/svg/Makefile.am include $(top_srcdir)/plugins/swapchannels/Makefile.am include $(top_srcdir)/plugins/synthesizer/Makefile.am include $(top_srcdir)/plugins/threshold/Makefile.am include $(top_srcdir)/plugins/timeavg/Makefile.am -#include $(top_srcdir)/plugins/timefront/Makefile.am -#include $(top_srcdir)/plugins/timestretch/Makefile.am -#include $(top_srcdir)/plugins/titler/Makefile.am +include $(top_srcdir)/plugins/timefront/Makefile.am +include $(top_srcdir)/plugins/timestretch/Makefile.am +include $(top_srcdir)/plugins/titler/Makefile.am include $(top_srcdir)/plugins/translate/Makefile.am include $(top_srcdir)/plugins/unsharp/Makefile.am -#include $(top_srcdir)/plugins/videoscope/Makefile.am +include $(top_srcdir)/plugins/videoscope/Makefile.am include $(top_srcdir)/plugins/wave/Makefile.am include $(top_srcdir)/plugins/whirl/Makefile.am include $(top_srcdir)/plugins/wipe/Makefile.am diff --git a/plugins/aging/Makefile.am b/plugins/aging/Makefile.am index 003d2f24..a5ce93d8 100644 --- a/plugins/aging/Makefile.am +++ b/plugins/aging/Makefile.am @@ -1,7 +1,7 @@ aging_la_srcdir = $(top_srcdir)/plugins/aging plugin_LTLIBRARIES += aging.la aging_la_LDFLAGS = -avoid-version -module -shared -aging_la_LIBADD = libeffecttv.la +aging_la_LIBADD = $(top_builddir)/libeffecttv.la aging_la_SOURCES = $(aging_la_srcdir)/aging.C $(aging_la_srcdir)/agingwindow.C aging_la_CXXFLAGS = $(LARGEFILE_CFLAGS) diff --git a/plugins/burn/Makefile.am b/plugins/burn/Makefile.am index 20ba69ae..a5713a04 100644 --- a/plugins/burn/Makefile.am +++ b/plugins/burn/Makefile.am @@ -1,11 +1,11 @@ burn_la_srcdir = $(top_srcdir)/plugins/burn plugin_LTLIBRARIES += burn.la burn_la_LDFLAGS = -avoid-version -module -shared -burn_la_LIBADD = $(top_builddir)/plugins/libeffectv/libeffectv.la +burn_la_LIBADD = $(top_builddir)/libeffecttv.la burn_la_SOURCES = $(burn_la_srcdir)/burn.C $(burn_la_srcdir)/burnwindow.C burn_la_CXXFLAGS = $(LARGEFILE_CFLAGS) -burn_la_CPPFLAGS = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime -I$(top_srcdir)/plugins/libeffectv -I$(top_srcdir)/plugins/colors +burn_la_CPPFLAGS = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime -I$(top_srcdir)/plugins/libeffecttv -I$(top_srcdir)/plugins/colors noinst_HEADERS += $(burn_la_srcdir)/burn.h $(burn_la_srcdir)/burnwindow.h $(burn_la_srcdir)/picon_png.h EXTRA_DIST += $(burn_la_srcdir)/picon.png diff --git a/plugins/denoisefft/Makefile.am b/plugins/denoisefft/Makefile.am index 20216af5..18cde976 100644 --- a/plugins/denoisefft/Makefile.am +++ b/plugins/denoisefft/Makefile.am @@ -1,7 +1,7 @@ denoisefft_la_srcdir = $(top_srcdir)/plugins/denoisefft plugin_LTLIBRARIES += denoisefft.la denoisefft_la_LDFLAGS = -avoid-version -module -shared -denoisefft_la_LIBADD = $(top_builddir)/plugins/libfourier/libfourier.la +denoisefft_la_LIBADD = $(top_builddir)/libfourier.la denoisefft_la_SOURCES = $(denoisefft_la_srcdir)/denoisefft.C denoisefft_la_CXXFLAGS = $(LARGEFILE_CFLAGS) diff --git a/plugins/diffkey/Makefile.am b/plugins/diffkey/Makefile.am index 12fb7db9..d3ed6a12 100644 --- a/plugins/diffkey/Makefile.am +++ b/plugins/diffkey/Makefile.am @@ -1,7 +1,7 @@ diffkey_la_srcdir = $(top_srcdir)/plugins/diffkey plugin_LTLIBRARIES += diffkey.la diffkey_la_LDFLAGS = -avoid-version -module -shared -diffkey_la_LIBADD = $(top_builddir)/plugins/colors/libcolors.la +diffkey_la_LIBADD = $(top_builddir)/libcolors.la diffkey_la_SOURCES = $(diffkey_la_srcdir)/diffkey.C diffkey_la_CXXFLAGS = $(LARGEFILE_CFLAGS) diff --git a/plugins/dot/Makefile.am b/plugins/dot/Makefile.am index 34b67ba7..9104c71d 100644 --- a/plugins/dot/Makefile.am +++ b/plugins/dot/Makefile.am @@ -1,11 +1,11 @@ dot_la_srcdir = $(top_srcdir)/plugins/dot plugin_LTLIBRARIES += dot.la dot_la_LDFLAGS = -avoid-version -module -shared -dot_la_LIBADD = $(top_builddir)/plugins/libeffectv/libeffectv.la +dot_la_LIBADD = $(top_builddir)/libeffecttv.la dot_la_SOURCES = $(dot_la_srcdir)/dot.C $(dot_la_srcdir)/dotwindow.C dot_la_CXXFLAGS = $(LARGEFILE_CFLAGS) -dot_la_CPPFLAGS = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime -I$(top_srcdir)/plugins/libeffectv -I$(top_srcdir)/plugins/colors +dot_la_CPPFLAGS = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime -I$(top_srcdir)/plugins/libeffecttv -I$(top_srcdir)/plugins/colors noinst_HEADERS += $(dot_la_srcdir)/dot.h $(dot_la_srcdir)/dotwindow.h $(dot_la_srcdir)/picon_png.h EXTRA_DIST += $(dot_la_srcdir)/picon.png diff --git a/plugins/histogram/Makefile.am b/plugins/histogram/Makefile.am index 81c28060..0779a327 100644 --- a/plugins/histogram/Makefile.am +++ b/plugins/histogram/Makefile.am @@ -1,7 +1,7 @@ histogram_la_srcdir = $(top_srcdir)/plugins/histogram plugin_LTLIBRARIES += histogram.la histogram_la_LDFLAGS = -avoid-version -module -shared -histogram_la_LIBADD = $(top_builddir)/plugins/colors/libcolors.la +histogram_la_LIBADD = $(top_builddir)/libcolors.la histogram_la_SOURCES = $(histogram_la_srcdir)/histogram.C $(histogram_la_srcdir)/histogramconfig.C $(histogram_la_srcdir)/histogramwindow.C histogram_la_CXXFLAGS = $(LARGEFILE_CFLAGS) diff --git a/plugins/holo/Makefile.am b/plugins/holo/Makefile.am index 8c5e7927..7aa214dc 100644 --- a/plugins/holo/Makefile.am +++ b/plugins/holo/Makefile.am @@ -1,11 +1,11 @@ holo_la_srcdir = $(top_srcdir)/plugins/holo plugin_LTLIBRARIES += holo.la holo_la_LDFLAGS = -avoid-version -module -shared -holo_la_LIBADD = $(top_builddir)/plugins/libeffectv/libeffectv.la +holo_la_LIBADD = $(top_builddir)/libeffecttv.la holo_la_SOURCES = $(holo_la_srcdir)/holo.C $(holo_la_srcdir)/holowindow.C holo_la_CXXFLAGS = $(LARGEFILE_CFLAGS) -holo_la_CPPFLAGS = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime -I$(top_srcdir)/plugins/libeffectv -I$(top_srcdir)/plugins/colors +holo_la_CPPFLAGS = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime -I$(top_srcdir)/plugins/libeffecttv -I$(top_srcdir)/plugins/colors noinst_HEADERS += $(holo_la_srcdir)/holo.h $(holo_la_srcdir)/holowindow.h $(holo_la_srcdir)/picon_png.h EXTRA_DIST += $(holo_la_srcdir)/picon.png diff --git a/plugins/parametric/Makefile.am b/plugins/parametric/Makefile.am index 1cde4e8e..a38ed349 100644 --- a/plugins/parametric/Makefile.am +++ b/plugins/parametric/Makefile.am @@ -1,7 +1,7 @@ parametric_la_srcdir = $(top_srcdir)/plugins/parametric plugin_LTLIBRARIES += parametric.la parametric_la_LDFLAGS = -avoid-version -module -shared -parametric_la_LIBADD = $(top_builddir)/plugins/libfourier/libfourier.la +parametric_la_LIBADD = $(top_builddir)/libfourier.la parametric_la_SOURCES = $(parametric_la_srcdir)/parametric.C parametric_la_CXXFLAGS = $(LARGEFILE_CFLAGS) diff --git a/plugins/pitch/Makefile.am b/plugins/pitch/Makefile.am index 6d1c3dd7..18c3f7de 100644 --- a/plugins/pitch/Makefile.am +++ b/plugins/pitch/Makefile.am @@ -1,7 +1,7 @@ pitch_la_srcdir = $(top_srcdir)/plugins/pitch plugin_LTLIBRARIES += pitch.la pitch_la_LDFLAGS = -avoid-version -module -shared -pitch_la_LIBADD = $(top_builddir)/plugins/libfourier/libfourier.la +pitch_la_LIBADD = $(top_builddir)/libfourier.la pitch_la_SOURCES = $(pitch_la_srcdir)/pitch.C pitch_la_CXXFLAGS = $(LARGEFILE_CFLAGS) diff --git a/plugins/shapewipe/Makefile.am b/plugins/shapewipe/Makefile.am index 9e1a10ef..ebb8fad1 100644 --- a/plugins/shapewipe/Makefile.am +++ b/plugins/shapewipe/Makefile.am @@ -4,7 +4,7 @@ shapewipe_la_LDFLAGS = -avoid-version -module -shared shapewipe_la_LIBADD = shapewipe_la_SOURCES = $(shapewipe_la_srcdir)/shapewipe.C shapewipe_la_CXXFLAGS = $(LARGEFILE_CFLAGS) \ - -DDEFAULT_SHAPE = $(shapewipe_la_srcdir)/\"$(shapewipedir)/heart.png\" + -DDEFAULT_SHAPE=\"$(shapewipedir)/heart.png\" shapewipe_la_CPPFLAGS = -I$(top_srcdir)/guicast -I$(top_srcdir)/cinelerra -I$(top_srcdir)/quicktime diff --git a/plugins/spectrogram/Makefile.am b/plugins/spectrogram/Makefile.am index 4e950373..a3dc3c33 100644 --- a/plugins/spectrogram/Makefile.am +++ b/plugins/spectrogram/Makefile.am @@ -1,7 +1,7 @@ spectrogram_la_srcdir = $(top_srcdir)/plugins/spectrogram plugin_LTLIBRARIES += spectrogram.la spectrogram_la_LDFLAGS = -avoid-version -module -shared -spectrogram_la_LIBADD = ../libfourier/libfourier.la +spectrogram_la_LIBADD = $(top_builddir)/libfourier.la spectrogram_la_SOURCES = $(spectrogram_la_srcdir)/spectrogram.C spectrogram_la_CXXFLAGS = $(LARGEFILE_CFLAGS) diff --git a/plugins/timefront/Makefile.am b/plugins/timefront/Makefile.am index 4a3b3e8e..fece9b11 100644 --- a/plugins/timefront/Makefile.am +++ b/plugins/timefront/Makefile.am @@ -1,7 +1,7 @@ timefront_la_srcdir = $(top_srcdir)/plugins/timefront plugin_LTLIBRARIES += timefront.la timefront_la_LDFLAGS = -avoid-version -module -shared -timefront_la_LIBADD = $(top_builddir)/plugins/colors/libcolors.la +timefront_la_LIBADD = $(top_builddir)/libcolors.la timefront_la_SOURCES = $(timefront_la_srcdir)/timefront.C timefront_la_CXXFLAGS = $(LARGEFILE_CFLAGS) diff --git a/plugins/timestretch/Makefile.am b/plugins/timestretch/Makefile.am index 14f984ff..effa85cf 100644 --- a/plugins/timestretch/Makefile.am +++ b/plugins/timestretch/Makefile.am @@ -1,7 +1,7 @@ timestretch_la_srcdir = $(top_srcdir)/plugins/timestretch plugin_LTLIBRARIES += timestretch.la timestretch_la_LDFLAGS = -avoid-version -module -shared -timestretch_la_LIBADD = ../libfourier/libfourier.la +timestretch_la_LIBADD = $(top_builddir)/libfourier.la timestretch_la_SOURCES = $(timestretch_la_srcdir)/timestretch.C $(timestretch_la_srcdir)/timestretchengine.C timestretch_la_CXXFLAGS = $(LARGEFILE_CFLAGS) diff --git a/plugins/titler/Makefile.am b/plugins/titler/Makefile.am index 88f508e2..b625eb57 100644 --- a/plugins/titler/Makefile.am +++ b/plugins/titler/Makefile.am @@ -1,7 +1,7 @@ titler_la_srcdir = $(top_srcdir)/plugins/titler plugin_LTLIBRARIES += titler.la titler_la_LDFLAGS = -avoid-version -module -shared -titler_la_LIBADD = $(top_builddir)/plugins/colors/libcolors.la -lfreetype +titler_la_LIBADD = $(top_builddir)/libcolors.la -lfreetype titler_la_SOURCES = $(titler_la_srcdir)/title.C $(titler_la_srcdir)/titlewindow.C titler_la_CXXFLAGS = $(LARGEFILE_CFLAGS) diff --git a/plugins/videoscope/Makefile.am b/plugins/videoscope/Makefile.am index 004d3d8a..dad7f5c8 100644 --- a/plugins/videoscope/Makefile.am +++ b/plugins/videoscope/Makefile.am @@ -1,7 +1,7 @@ videoscope_la_srcdir = $(top_srcdir)/plugins/videoscope plugin_LTLIBRARIES += videoscope.la videoscope_la_LDFLAGS = -avoid-version -module -shared -videoscope_la_LIBADD = $(top_builddir)/plugins/colors/libcolors.la +videoscope_la_LIBADD = $(top_builddir)/libcolors.la videoscope_la_SOURCES = $(videoscope_la_srcdir)/videoscope.C videoscope_la_CXXFLAGS = $(LARGEFILE_CFLAGS) -- 2.11.4.GIT