diff options
| author | Jan Schmidt <thaytan@mad.scientist.com> | 2007-06-14 12:14:24 +0000 |
|---|---|---|
| committer | Jan Schmidt <thaytan@mad.scientist.com> | 2007-06-14 12:14:24 +0000 |
| commit | 93fb3e1e6a11068ade17d8274a04d87cc63d8bb3 (patch) | |
| tree | 876cdb41643fc854eda641a9e7d7fbdd356b4aa4 | |
| parent | 98165a69eeb1236c9aa189e24acbf8be442131d3 (diff) | |
Make sure to dist everything needed for win32 builds.
Original commit message from CVS:
* configure.ac:
* sys/Makefile.am:
* sys/directdraw/Makefile.am:
* sys/directsound/Makefile.am:
* sys/waveform/Makefile.am:
Make sure to dist everything needed for win32 builds.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | sys/Makefile.am | 2 | ||||
| -rw-r--r-- | sys/directdraw/Makefile.am | 2 | ||||
| -rw-r--r-- | sys/directsound/Makefile.am | 2 | ||||
| -rw-r--r-- | sys/waveform/Makefile.am | 16 |
6 files changed, 31 insertions, 1 deletions
@@ -1,3 +1,12 @@ +2007-06-14 Jan Schmidt <thaytan@mad.scientist.com> + + * configure.ac: + * sys/Makefile.am: + * sys/directdraw/Makefile.am: + * sys/directsound/Makefile.am: + * sys/waveform/Makefile.am: + Make sure to dist everything needed for win32 builds. + 2007-06-14 Edward Hervey <edward@fluendo.com> * gst/qtdemux/qtdemux.c: (qtdemux_parse_trak): diff --git a/configure.ac b/configure.ac index f04c12bc..bd59459c 100644 --- a/configure.ac +++ b/configure.ac @@ -1058,6 +1058,7 @@ sys/sunaudio/Makefile sys/osxaudio/Makefile sys/osxvideo/Makefile sys/v4l2/Makefile +sys/waveform/Makefile sys/ximage/Makefile po/Makefile.in tests/Makefile diff --git a/sys/Makefile.am b/sys/Makefile.am index b4d52f12..8e1528e4 100644 --- a/sys/Makefile.am +++ b/sys/Makefile.am @@ -78,4 +78,4 @@ endif SUBDIRS=$(DIRECTDRAW_DIR) $(DIRECTSOUND_DIR) $(OSS_DIR) $(OSX_AUDIO_DIR) $(OSX_VIDEO_DIR) $(SUNAUDIO_DIR) $(V4L2_DIR) $(XIMAGE_DIR) -DIST_SUBDIRS=directdraw directsound oss osxaudio osxvideo sunaudio v4l2 ximage +DIST_SUBDIRS=directdraw directsound oss osxaudio osxvideo sunaudio v4l2 waveform ximage diff --git a/sys/directdraw/Makefile.am b/sys/directdraw/Makefile.am index 3fa5e85f..dddaf189 100644 --- a/sys/directdraw/Makefile.am +++ b/sys/directdraw/Makefile.am @@ -7,3 +7,5 @@ libgstdirectdrawsink_la_LIBADD = $(DIRECTDRAW_LIBS) \ $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
-lgstinterfaces-$(GST_MAJORMINOR)
libgstdirectdrawsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTDRAW_LDFLAGS)
+
+noinst_HEADERS= gstdirectdrawsink.h
diff --git a/sys/directsound/Makefile.am b/sys/directsound/Makefile.am index 3b24de62..010ec6cd 100644 --- a/sys/directsound/Makefile.am +++ b/sys/directsound/Makefile.am @@ -7,3 +7,5 @@ libgstdirectsoundsink_la_LIBADD = $(DIRECTSOUND_LIBS) \ $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \
-lgstaudio-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR)
libgstdirectsoundsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTSOUND_LDFLAGS)
+
+noinst_HEADERS = gstdirectsoundsink.h
diff --git a/sys/waveform/Makefile.am b/sys/waveform/Makefile.am new file mode 100644 index 00000000..456e91f8 --- /dev/null +++ b/sys/waveform/Makefile.am @@ -0,0 +1,16 @@ +plugin_LTLIBRARIES = libgstwaveformsink.la + +# FIXME: Replace DIRECTSOUND CFLAGS+LIBS with waveform related ones and fix +# the configure.ac + sys/Makefile.am to get this stuff building in MingW +# For now, it's just disted for use in the VS builds. + +libgstwaveformsink_la_SOURCES = gstwaveformsink.c gstwaveformplugin.c +libgstwaveformsink_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \ + $(GST_PLUGINS_BASE_CFLAGS) $(DIRECTSOUND_CFLAGS) +libgstwaveformsink_la_LIBADD = $(DIRECTSOUND_LIBS) \ + $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \ + -lgstaudio-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR) +libgstwaveformsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTSOUND_LDFLAGS) + +noinst_HEADERS = gstwaveformsink.h + |