From: Tim-Philipp Müller Date: Fri, 16 Dec 2016 19:07:51 +0000 (+0000) Subject: win32: remove platform-specific copies of generated headers X-Git-Tag: 1.19.3~505^2~246 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f1146144eb11b9b6c143c3cf575daf5b8749d3d6;p=platform%2Fupstream%2Fgstreamer.git win32: remove platform-specific copies of generated headers Unused and no longer needed. --- diff --git a/Makefile.am b/Makefile.am index 507d392..6462feb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,16 +2,11 @@ DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc SUBDIRS = \ gst-libs gst ext docs m4 tests common pkgconfig po - -# include before EXTRA_DIST for win32 assignment -include $(top_srcdir)/common/win32.mak EXTRA_DIST = \ depcomp \ AUTHORS COPYING NEWS README RELEASE REQUIREMENTS \ - ChangeLog gst-plugins-ugly.doap autogen.sh \ - $(win32) - + ChangeLog gst-plugins-ugly.doap autogen.sh DISTCLEANFILES = _stdint.h @@ -35,10 +30,6 @@ build-checks: true endif -win32-update: - cp $(top_builddir)/win32/common/config.h-new \ - $(top_builddir)/win32/common/config.h - include $(top_srcdir)/common/coverage/lcov.mak # cruft: plugins that have been merged or moved or renamed @@ -49,7 +40,9 @@ CRUFT_FILES = \ $(top_builddir)/common/shave-libtool CRUFT_DIRS = \ - $(top_srcdir)/docs/plugins/tmpl + $(top_srcdir)/docs/plugins/tmpl \ + $(top_builddir)/win32 \ + $(top_srcdir)/win32 include $(top_srcdir)/common/cruft.mak diff --git a/configure.ac b/configure.ac index 587188f..cf1f3af 100644 --- a/configure.ac +++ b/configure.ac @@ -498,47 +498,6 @@ pkgconfig/Makefile pkgconfig/gstreamer-plugins-ugly-uninstalled.pc ) -dnl Create the config.h file for Visual Studio builds -dnl Beware of spaces and /'s in some of the shell variable contents. -sed \ - -e 's/.*config.h.in.*autoheader.*/\/* Autogenerated config.h created for win32 Visual Studio builds *\/\n\n\/* PREFIX -- specifically added for Windows for easier moving *\/\n#define PREFIX "C:\\\\gstreamer"\n\n/' \ - -e 's/.* GETTEXT_PACKAGE$/#define GETTEXT_PACKAGE "'$GETTEXT_PACKAGE'"/' \ - -e 's/.* GST_DATADIR$/#define GST_DATADIR PREFIX "\\\\share"/' \ - -e 's/.* GST_LEVEL_DEFAULT$/#define GST_LEVEL_DEFAULT GST_LEVEL_ERROR/' \ - -e 's/.* GST_LICENSE$/#define GST_LICENSE "'$GST_LICENSE'"/' \ - -e 's/.* GST_API_VERSION$/#define GST_API_VERSION "'$GST_API_VERSION'"/' \ - -e "s,.* GST_PACKAGE_NAME$,#define GST_PACKAGE_NAME \"${GST_PACKAGE_NAME}\"," \ - -e 's/.* GST_PACKAGE_ORIGIN$/#define GST_PACKAGE_ORIGIN "Unknown package origin"/' \ - -e "s,.* GST_PACKAGE_RELEASE_DATETIME$,#define GST_PACKAGE_RELEASE_DATETIME \"${GST_PACKAGE_RELEASE_DATETIME}\"," \ - -e 's/.* HAVE_CPU_I386$/#define HAVE_CPU_I386 1/' \ - -e 's/.* HAVE_FGETPOS$/#define HAVE_FGETPOS 1/' \ - -e 's/.* HAVE_FSETPOS$/#define HAVE_FSETPOS 1/' \ - -e 's/.* HAVE_LIBXML2$/#define HAVE_LIBXML2 1/' \ - -e 's/.* HAVE_PROCESS_H$/#define HAVE_PROCESS_H 1/' \ - -e 's/.* HAVE_STDLIB_H$/#define HAVE_STDLIB_H 1/' \ - -e 's/.* HAVE_STRING_H$/#define HAVE_STRING_H 1/' \ - -e 's/.* HAVE_SYS_STAT_H$/#define HAVE_SYS_STAT_H 1/' \ - -e 's/.* HAVE_SYS_TYPES_H$/#define HAVE_SYS_TYPES_H 1/' \ - -e 's/.* HAVE_WIN32$/#define HAVE_WIN32 1/' \ - -e 's/.* HAVE_WINSOCK2_H$/#define HAVE_WINSOCK2_H 1/' \ - -e 's/.* HOST_CPU$/#define HOST_CPU "i686"/' \ - -e 's/.* LIBDIR$/#ifdef _DEBUG\n# define LIBDIR PREFIX "\\\\debug\\\\lib"\n#else\n# define LIBDIR PREFIX "\\\\lib"\n#endif/' \ - -e 's/.* LOCALEDIR$/#define LOCALEDIR PREFIX "\\\\share\\\\locale"/' \ - -e "s/.* PACKAGE$/#define PACKAGE \"$PACKAGE\"/" \ - -e 's/.* PACKAGE_BUGREPORT$/#define PACKAGE_BUGREPORT "http:\/\/bugzilla.gnome.org\/enter_bug.cgi?product=GStreamer"/' \ - -e "s/.* PACKAGE_NAME$/#define PACKAGE_NAME \"$PACKAGE_NAME\"/" \ - -e "s/.* PACKAGE_STRING$/#define PACKAGE_STRING \"$PACKAGE_STRING\"/" \ - -e 's/.* PACKAGE_TARNAME$/#define PACKAGE_TARNAME "'$PACKAGE_TARNAME'"/' \ - -e 's/.* PACKAGE_VERSION$/#define PACKAGE_VERSION "'$PACKAGE_VERSION'"/' \ - -e 's/.* PLUGINDIR$/#ifdef _DEBUG\n# define PLUGINDIR PREFIX "\\\\debug\\\\lib\\\\gstreamer-0.11"\n#else\n# define PLUGINDIR PREFIX "\\\\lib\\\\gstreamer-0.11"\n#endif/' \ - -e 's/.* USE_BINARY_REGISTRY$/#define USE_BINARY_REGISTRY/' \ - -e 's/.* VERSION$/#define VERSION "'$VERSION'"/' \ - -e "s/.* DEFAULT_AUDIOSINK$/#define DEFAULT_AUDIOSINK \"directsoundsink\"/" \ - -e "s/.* DEFAULT_AUDIOSRC$/#define DEFAULT_AUDIOSRC \"audiotestsrc\"/" \ - -e "s/.* DEFAULT_VIDEOSRC$/#define DEFAULT_VIDEOSRC \"videotestsrc\"/" \ - -e "s/.* DEFAULT_VISUALIZER$/#define DEFAULT_VISUALIZER \"goom\"/" \ - config.h.in >win32/common/config.h-new - AC_OUTPUT AG_GST_OUTPUT_PLUGINS diff --git a/win32/MANIFEST b/win32/MANIFEST deleted file mode 100644 index 35c6443..0000000 --- a/win32/MANIFEST +++ /dev/null @@ -1,2 +0,0 @@ -win32/MANIFEST -win32/common/config.h diff --git a/win32/common/.gitignore b/win32/common/.gitignore deleted file mode 100644 index d2cf684..0000000 --- a/win32/common/.gitignore +++ /dev/null @@ -1 +0,0 @@ -config.h-new diff --git a/win32/common/config.h b/win32/common/config.h deleted file mode 100644 index 81853f0..0000000 --- a/win32/common/config.h +++ /dev/null @@ -1,311 +0,0 @@ -/* Autogenerated config.h created for win32 Visual Studio builds */ - -/* PREFIX -- specifically added for Windows for easier moving */ -#define PREFIX "C:\\gstreamer" - - - -/* Define if building universal (internal helper macro) */ -#undef AC_APPLE_UNIVERSAL_BUILD - -/* Default audio sink */ -#define DEFAULT_AUDIOSINK "directsoundsink" - -/* Default audio source */ -#define DEFAULT_AUDIOSRC "audiotestsrc" - -/* Default video sink */ -#undef DEFAULT_VIDEOSINK - -/* Default video source */ -#define DEFAULT_VIDEOSRC "videotestsrc" - -/* Default visualizer */ -#define DEFAULT_VISUALIZER "goom" - -/* Disable Orc */ -#undef DISABLE_ORC - -/* Define to 1 if translation of program messages to the user's native - language is requested. */ -#undef ENABLE_NLS - -/* gettext package name */ -#define GETTEXT_PACKAGE "gst-plugins-ugly-1.0" - -/* The GIO library directory. */ -#undef GIO_LIBDIR - -/* The GIO modules directory. */ -#undef GIO_MODULE_DIR - -/* The GIO install prefix. */ -#undef GIO_PREFIX - -/* GStreamer API Version */ -#define GST_API_VERSION "1.0" - -/* Define if extra runtime checks should be enabled */ -#undef GST_ENABLE_EXTRA_CHECKS - -/* macro to use to show function name */ -#undef GST_FUNCTION - -/* Defined if gcov is enabled to force a rebuild due to config.h changing */ -#undef GST_GCOV_ENABLED - -/* Default errorlevel to use */ -#define GST_LEVEL_DEFAULT GST_LEVEL_ERROR - -/* GStreamer license */ -#define GST_LICENSE "LGPL" - -/* package name in plugins */ -#define GST_PACKAGE_NAME "GStreamer Ugly Plug-ins source release" - -/* package origin */ -#define GST_PACKAGE_ORIGIN "Unknown package origin" - -/* GStreamer package release date/time for plugins as YYYY-MM-DD */ -#define GST_PACKAGE_RELEASE_DATETIME "2016-11-01" - -/* Define if static plugins should be built */ -#undef GST_PLUGIN_BUILD_STATIC - -/* Define to enable a52dec (used by a52dec). */ -#undef HAVE_A52DEC - -/* Define to enable amrnb library (used by amrnb). */ -#undef HAVE_AMRNB - -/* Define to enable amrwb library (used by amrwbdec). */ -#undef HAVE_AMRWB - -/* Define to enable cdio library (used by cdio). */ -#undef HAVE_CDIO - -/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the - CoreFoundation framework. */ -#undef HAVE_CFLOCALECOPYCURRENT - -/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in - the CoreFoundation framework. */ -#undef HAVE_CFPREFERENCESCOPYAPPVALUE - -/* Define if the target CPU is AARCH64 */ -#undef HAVE_CPU_AARCH64 - -/* Define if the target CPU is an Alpha */ -#undef HAVE_CPU_ALPHA - -/* Define if the target CPU is an ARC */ -#undef HAVE_CPU_ARC - -/* Define if the target CPU is an ARM */ -#undef HAVE_CPU_ARM - -/* Define if the target CPU is a CRIS */ -#undef HAVE_CPU_CRIS - -/* Define if the target CPU is a CRISv32 */ -#undef HAVE_CPU_CRISV32 - -/* Define if the target CPU is a HPPA */ -#undef HAVE_CPU_HPPA - -/* Define if the target CPU is an x86 */ -#define HAVE_CPU_I386 1 - -/* Define if the target CPU is a IA64 */ -#undef HAVE_CPU_IA64 - -/* Define if the target CPU is a M68K */ -#undef HAVE_CPU_M68K - -/* Define if the target CPU is a MIPS */ -#undef HAVE_CPU_MIPS - -/* Define if the target CPU is a PowerPC */ -#undef HAVE_CPU_PPC - -/* Define if the target CPU is a 64 bit PowerPC */ -#undef HAVE_CPU_PPC64 - -/* Define if the target CPU is a S390 */ -#undef HAVE_CPU_S390 - -/* Define if the target CPU is a SPARC */ -#undef HAVE_CPU_SPARC - -/* Define if the target CPU is a x86_64 */ -#undef HAVE_CPU_X86_64 - -/* Define if the GNU dcgettext() function is already present or preinstalled. - */ -#undef HAVE_DCGETTEXT - -/* Define to 1 if you have the header file. */ -#undef HAVE_DLFCN_H - -/* define for working do while(0) macros */ -#undef HAVE_DOWHILE_MACROS - -/* Define to enable dvdread library (used by dvdreadsrc). */ -#undef HAVE_DVDREAD - -/* Define to enable building of experimental plug-ins. */ -#undef HAVE_EXPERIMENTAL - -/* Define to enable building of plug-ins with external deps. */ -#undef HAVE_EXTERNAL - -/* defined if the compiler implements __func__ */ -#undef HAVE_FUNC - -/* defined if the compiler implements __FUNCTION__ */ -#undef HAVE_FUNCTION - -/* Define if the GNU gettext() function is already present or preinstalled. */ -#undef HAVE_GETTEXT - -/* Define if you have the iconv() function and it works. */ -#undef HAVE_ICONV - -/* Define to 1 if you have the header file. */ -#undef HAVE_INTTYPES_H - -/* Define to enable lame mp3 encoder library (used by lame). */ -#undef HAVE_LAME - -/* Define to enable mad mp3 decoder (used by mad). */ -#undef HAVE_MAD - -/* Define to 1 if you have the header file. */ -#undef HAVE_MALLOC_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - -/* Define to enable mpeg2dec (used by mpeg2dec). */ -#undef HAVE_MPEG2DEC - -/* Define to enable mpg123 audio decoder (used by mpg123). */ -#undef HAVE_MPG123 - -/* Use Orc */ -#undef HAVE_ORC - -/* defined if the compiler implements __PRETTY_FUNCTION__ */ -#undef HAVE_PRETTY_FUNCTION - -/* Define if RDTSC is available */ -#undef HAVE_RDTSC - -/* Define to enable libsidplay (used by sid). */ -#undef HAVE_SIDPLAY - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to enable twolame (used by twolame). */ -#undef HAVE_TWOLAME - -/* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H - -/* Define if valgrind should be used */ -#undef HAVE_VALGRIND - -/* Define to 1 if you have the header file. */ -#define HAVE_WINSOCK2_H 1 - -/* Define to enable x264 plug-in (used by x264). */ -#undef HAVE_X264 - -/* the host CPU */ -#define HOST_CPU "i686" - -/* gettext locale dir */ -#define LOCALEDIR PREFIX "\\share\\locale" - -/* Define to the sub-directory where libtool stores uninstalled libraries. */ -#undef LT_OBJDIR - -/* Name of package */ -#define PACKAGE "gst-plugins-ugly" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "GStreamer Ugly Plug-ins" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "GStreamer Ugly Plug-ins 1.10.0" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "gst-plugins-ugly" - -/* Define to the home page for this package. */ -#undef PACKAGE_URL - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "1.10.0" - -/* directory where plugins are located */ -#ifdef _DEBUG -# define PLUGINDIR PREFIX "\\debug\\lib\\gstreamer-0.11" -#else -# define PLUGINDIR PREFIX "\\lib\\gstreamer-0.11" -#endif - -/* The size of `char', as computed by sizeof. */ -#undef SIZEOF_CHAR - -/* The size of `int', as computed by sizeof. */ -#undef SIZEOF_INT - -/* The size of `long', as computed by sizeof. */ -#undef SIZEOF_LONG - -/* The size of `short', as computed by sizeof. */ -#undef SIZEOF_SHORT - -/* The size of `void*', as computed by sizeof. */ -#undef SIZEOF_VOIDP - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* the target CPU */ -#undef TARGET_CPU - -/* Version number of package */ -#define VERSION "1.10.0" - -/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most - significant byte first (like Motorola and SPARC, unlike Intel). */ -#if defined AC_APPLE_UNIVERSAL_BUILD -# if defined __BIG_ENDIAN__ -# define WORDS_BIGENDIAN 1 -# endif -#else -# ifndef WORDS_BIGENDIAN -# undef WORDS_BIGENDIAN -# endif -#endif