From 4f5bb5fc3aca30d14d7ef8e3e58a33cceacb6fa2 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Sun, 27 Jun 2004 15:42:15 +0000 Subject: unbreak install Original commit message from CVS: unbreak install --- ChangeLog | 8 ++++++++ gst-libs/gst/colorbalance/Makefile.am | 4 +++- gst-libs/gst/mixer/Makefile.am | 3 ++- gst-libs/gst/play/Makefile.am | 2 +- gst-libs/gst/tuner/Makefile.am | 3 ++- 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 58057689..1d321a5c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2004-06-27 Thomas Vander Stichele + + * gst-libs/gst/colorbalance/Makefile.am: + * gst-libs/gst/mixer/Makefile.am: + * gst-libs/gst/play/Makefile.am: + * gst-libs/gst/tuner/Makefile.am: + unbreak Company's fix that didn't install the -enum.h files + 2004-06-27 Wim Taymans * ext/dv/gstdvdec.c: (gst_dvdec_push), (gst_dvdec_loop), diff --git a/gst-libs/gst/colorbalance/Makefile.am b/gst-libs/gst/colorbalance/Makefile.am index e7cf3d8c..db2ba4d6 100644 --- a/gst-libs/gst/colorbalance/Makefile.am +++ b/gst-libs/gst/colorbalance/Makefile.am @@ -18,7 +18,9 @@ built_headers = \ colorbalance-marshal.h \ colorbalance-enumtypes.h -libgstcolorbalanceinclude_HEADERS = $(colorbalance_headers) +libgstcolorbalanceinclude_HEADERS = \ + $(colorbalance_headers) \ + colorbalance-enumtypes.h nodist_libgstcolorbalanceinclude_HEADERS = \ colorbalance-enumtypes.h diff --git a/gst-libs/gst/mixer/Makefile.am b/gst-libs/gst/mixer/Makefile.am index e5abf687..ba5348dd 100644 --- a/gst-libs/gst/mixer/Makefile.am +++ b/gst-libs/gst/mixer/Makefile.am @@ -21,7 +21,8 @@ built_headers = \ mixer-enumtypes.h libgstmixerinclude_HEADERS = \ - $(mixer_headers) + $(mixer_headers) \ + mixer-enumtypes.h # FIXME 0.9: don't include marshal files nodist_libgstmixerinclude_HEADERS = \ diff --git a/gst-libs/gst/play/Makefile.am b/gst-libs/gst/play/Makefile.am index ef17d461..1a2e86ff 100644 --- a/gst-libs/gst/play/Makefile.am +++ b/gst-libs/gst/play/Makefile.am @@ -17,7 +17,7 @@ libgstplay_@GST_MAJORMINOR@_la_SOURCES = play.c nodist_libgstplay_@GST_MAJORMINOR@_la_SOURCES = play-enumtypes.c libgstplay_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/play -libgstplay_@GST_MAJORMINOR@include_HEADERS = $(play_headers) +libgstplay_@GST_MAJORMINOR@include_HEADERS = $(play_headers) $(built_headers) libgstplay_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_CFLAGS) libgstplay_@GST_MAJORMINOR@_la_LIBADD = \ diff --git a/gst-libs/gst/tuner/Makefile.am b/gst-libs/gst/tuner/Makefile.am index 804e33db..96c62b67 100644 --- a/gst-libs/gst/tuner/Makefile.am +++ b/gst-libs/gst/tuner/Makefile.am @@ -20,7 +20,8 @@ built_headers = \ tuner-enumtypes.h libgsttunerinclude_HEADERS = \ - $(tuner_headers) + $(tuner_headers) \ + tuner-enumtypes.h # FIXME 0.9: don't install nodist_libgsttunerinclude_HEADERS = \ -- cgit v1.2.1