Original commit message from CVS:
adding back RELEASE
clean up disting of built files
+2004-02-27 Thomas Vander Stichele <thomas at apestaart dot org>
+
+ * Makefile.am:
+ * gstreamer.spec.in:
+ put back RELEASE
+ * gst/Makefile.am:
+ clean up non-disting of built files
+ * testsuite/debug/commandline.c:
+ test fix for option rename
+
2004-02-26 David Schleef <ds@schleef.org>
* configure.ac: We don't really need glib-2.3. Also remove
2004-02-26 David Schleef <ds@schleef.org>
* configure.ac: We don't really need glib-2.3. Also remove
EXTRA_DIST = gstreamer.spec.in gst-element-check.m4 \
configure.ac autogen.sh depcomp \
EXTRA_DIST = gstreamer.spec.in gst-element-check.m4 \
configure.ac autogen.sh depcomp \
- REQUIREMENTS ABOUT-NLS DOCBUILDING DEVEL \
+ REQUIREMENTS ABOUT-NLS DOCBUILDING DEVEL RELEASE \
idiottest.mak common
CLEANFILES = gst-element-check-@GST_MAJORMINOR@.m4
idiottest.mak common
CLEANFILES = gst-element-check-@GST_MAJORMINOR@.m4
GST_URI_SRC = gsturi.c
endif
GST_URI_SRC = gsturi.c
endif
-EXTRA_libgstreamer_@GST_MAJORMINOR@_la_SOURCES = gstcpuid_i386.s gstmarshal.list gstxml.c gstparse.c gsttrace.c
-
SUBDIRS = $(GST_PARSE_DIRS) $(GST_REGISTRY_DIRS) . autoplug elements schedulers $(GST_INDEX_DIRS)
DIST_SUBDIRS = autoplug elements parse registries schedulers indexers
SUBDIRS = $(GST_PARSE_DIRS) $(GST_REGISTRY_DIRS) . autoplug elements schedulers $(GST_INDEX_DIRS)
DIST_SUBDIRS = autoplug elements parse registries schedulers indexers
-libgstreamer_@GST_MAJORMINOR@_la_SOURCES = \
+# make variables for all generated source and header files to make the
+# distinction clear
+
+built_header_configure = gstconfig.h gstversion.h
+built_header_make = gstenumtypes.h gstmarshal.h
+built_source_make = $(GST_ENUMTYPES_SRC) gstmarshal.c
+
+EXTRA_libgstreamer_@GST_MAJORMINOR@_la_SOURCES = \
+ gstcpuid_i386.s gstmarshal.list gstxml.c gstparse.c gsttrace.c
+
+libgstreamer_@GST_MAJORMINOR@_la_SOURCES = \
gstobject.c \
gstatomic.c \
gstbin.c \
gstobject.c \
gstatomic.c \
gstbin.c \
$(GSTARCH_SRCS) \
$(GST_LOADSAVE_SRC)
$(GSTARCH_SRCS) \
$(GST_LOADSAVE_SRC)
-nodist_libgstreamer_@GST_MAJORMINOR@_la_SOURCES = \
- gstmarshal.c
-
-BUILT_SOURCES = gstversion.h gstconfig.h gstmarshal.h gstmarshal.c gstenumtypes.h $(GST_ENUMTYPES_SRC)
-CLEANFILES = gstmarshal.h gstmarshal.c gstenumtypes.h $(GST_ENUMTYPES_SRC)
-DISTCLEANFILES = gstversion.h gstconfig.h
-
-libgstreamer_@GST_MAJORMINOR@_la_CFLAGS = -D_GNU_SOURCE \
- $(GST_CFLAGS) \
- -DG_LOG_DOMAIN=g_log_domain_gstreamer \
+# do not put files in the distribution that are generated
+nodist_libgstreamer_@GST_MAJORMINOR@_la_SOURCES = $(built_source_make)
+
+# BUILT_SOURCES are built on make all/check/install before all other targets
+BUILT_SOURCES = \
+ $(built_header_configure) \
+ $(built_header_make) \
+ $(built_source_make)
+# CLEANFILES is for files generated by make
+CLEANFILES = $(built_header_make) $(built_source_make)
+# DISTCLEANFILES is for files generated by configure
+DISTCLEANFILES = $(built_header_configure)
+
+libgstreamer_@GST_MAJORMINOR@_la_CFLAGS = \
+ -D_GNU_SOURCE \
+ $(GST_CFLAGS) \
+ -DG_LOG_DOMAIN=g_log_domain_gstreamer \
-DGST_MAJORMINOR=\""$(GST_MAJORMINOR)"\"
-DGST_MAJORMINOR=\""$(GST_MAJORMINOR)"\"
-libgstreamer_@GST_MAJORMINOR@_la_LIBADD = $(LIBGST_LIBS) $(GST_PARSE_LIBADD) $(GST_REGISTRY_LIBADD)
-libgstreamer_@GST_MAJORMINOR@_la_LDFLAGS = @GST_LT_LDFLAGS@ -version-info @GST_LIBVERSION@
+libgstreamer_@GST_MAJORMINOR@_la_LIBADD = \
+ $(LIBGST_LIBS) $(GST_PARSE_LIBADD) $(GST_REGISTRY_LIBADD)
+libgstreamer_@GST_MAJORMINOR@_la_LDFLAGS = \
+ @GST_LT_LDFLAGS@ -version-info @GST_LIBVERSION@
libgstreamer_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst
libgstreamer_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst
libgstreamer_@GST_MAJORMINOR@include_HEADERS = $(gst_headers)
nodist_libgstreamer_@GST_MAJORMINOR@include_HEADERS = \
libgstreamer_@GST_MAJORMINOR@include_HEADERS = $(gst_headers)
nodist_libgstreamer_@GST_MAJORMINOR@include_HEADERS = \
- gstconfig.h \
- gstversion.h \
- gstmarshal.h \
- gstenumtypes.h
+ $(built_header_configure) $(built_header_make)
noinst_HEADERS = \
gettext.h \
noinst_HEADERS = \
gettext.h \
%files -f gstreamer-%{majorminor}.lang
%defattr(-, root, root, -)
%files -f gstreamer-%{majorminor}.lang
%defattr(-, root, root, -)
-%doc AUTHORS COPYING README TODO COPYING.LIB ABOUT-NLS REQUIREMENTS DOCBUILDING
+%doc AUTHORS COPYING NEWS README TODO RELEASE
+·doc COPYING.LIB ABOUT-NLS REQUIREMENTS DOCBUILDING
%{_libdir}/libgstreamer-%{majorminor}.so.*
%{_libdir}/libgstcontrol-%{majorminor}.so.*
%dir %{_libdir}/gstreamer-%{majorminor}
%{_libdir}/libgstreamer-%{majorminor}.so.*
%{_libdir}/libgstcontrol-%{majorminor}.so.*
%dir %{_libdir}/gstreamer-%{majorminor}