Makefile.am: updates for win32

Original commit message from CVS:
* Makefile.am:
updates for win32
* configure.ac:
define GST_MAJORMINOR so we have it available in win32/common/config.h
Possibly remove it from our Makefile.am files later
* win32/common/config.h:
* win32/common/config.h.in:
added GST_MAJORMINOR
* win32/common/gstenumtypes.c: (register_gst_resource_error):
* win32/common/gstversion.h:
updated
This commit is contained in:
Thomas Vander Stichele 2006-05-12 14:53:49 +00:00
parent 91818f0288
commit 34eabc4eaa
7 changed files with 65 additions and 40 deletions

View file

@ -1,3 +1,17 @@
2006-05-12 Thomas Vander Stichele <thomas at apestaart dot org>
* Makefile.am:
updates for win32
* configure.ac:
define GST_MAJORMINOR so we have it available in win32/common/config.h
Possibly remove it from our Makefile.am files later
* win32/common/config.h:
* win32/common/config.h.in:
added GST_MAJORMINOR
* win32/common/gstenumtypes.c: (register_gst_resource_error):
* win32/common/gstversion.h:
updated
2006-05-12 Sebastien Moutte <sebastien@moutte.net>
* win32/MANIFEST:

View file

@ -103,6 +103,9 @@ check-torture:
echo "'check' library not installed, skipping"
endif
# FIXME: this target should be run every time we do "make release"
# find a way of automating that
win32-update:
for f in gstversion.h gstenumtypes.c gstenumtypes.h; do \
cp $(top_builddir)/gst/$$f win32/common; done
$(top_srcdir)/tools/gst-indent win32/common/gstenumtypes.c

View file

@ -33,6 +33,8 @@ GST_MAJORMINOR=$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR
dnl we override it here for release candidates for a new series
GST_MAJORMINOR=0.10
AC_SUBST(GST_MAJORMINOR)
AC_DEFINE_UNQUOTED(GST_MAJORMINOR, "$GST_MAJORMINOR",
[library major.minor version])
dnl CURRENT, REVISION, AGE
dnl - library source changed -> increment REVISION

View file

@ -29,6 +29,9 @@
/* GStreamer license */
#define GST_LICENSE "LGPL"
/* library major.minor version */
#define GST_MAJORMINOR "0.10"
/* package name in plugins */
#define GST_PACKAGE_NAME "GStreamer CVS/prerelease"

View file

@ -29,6 +29,9 @@
/* GStreamer license */
#define GST_LICENSE "@GST_LICENSE@"
/* library major.minor version */
#define GST_MAJORMINOR "@GST_MAJORMINOR@"
/* package name in plugins */
#define GST_PACKAGE_NAME "@GST_PACKAGE_NAME@"

View file

@ -397,6 +397,8 @@ register_gst_resource_error (GType * id)
{GST_RESOURCE_ERROR_SEEK, "GST_RESOURCE_ERROR_SEEK", "seek"},
{GST_RESOURCE_ERROR_SYNC, "GST_RESOURCE_ERROR_SYNC", "sync"},
{GST_RESOURCE_ERROR_SETTINGS, "GST_RESOURCE_ERROR_SETTINGS", "settings"},
{GST_RESOURCE_ERROR_NO_SPACE_LEFT, "GST_RESOURCE_ERROR_NO_SPACE_LEFT",
"no-space-left"},
{GST_RESOURCE_ERROR_NUM_ERRORS, "GST_RESOURCE_ERROR_NUM_ERRORS",
"num-errors"},
{0, NULL, NULL}

View file

@ -57,7 +57,7 @@ G_BEGIN_DECLS
*
* The micro version of GStreamer at compile time:
*/
#define GST_VERSION_MICRO (6)
#define GST_VERSION_MICRO (5)
/**
* GST_VERSION_NANO:
*
@ -66,8 +66,6 @@ G_BEGIN_DECLS
*/
#define GST_VERSION_NANO (1)
#define GST_MAJORMINOR "0.10"
G_END_DECLS
#endif /* __GST_VERSION_H__ */