From 513765078234fc5596bec3d461367ee587a679cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Sun, 20 Nov 2016 16:15:07 +0000 Subject: [PATCH] win32: remove copies of generated headers --- Makefile.am | 11 +- configure.ac | 41 ---- win32/MANIFEST | 2 - win32/common/config.h | 460 ------------------------------------------ 4 files changed, 2 insertions(+), 512 deletions(-) delete mode 100644 win32/MANIFEST delete mode 100644 win32/common/config.h diff --git a/Makefile.am b/Makefile.am index 6c9786fe24..7f5ec915c0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,14 +13,10 @@ SUBDIRS = $(ALWAYS_SUBDIRS) DIST_SUBDIRS = $(ALWAYS_SUBDIRS) -# include before EXTRA_DIST for win32 assignment -include $(top_srcdir)/common/win32.mak - EXTRA_DIST = \ gst-plugins-good.spec depcomp \ AUTHORS COPYING NEWS README RELEASE REQUIREMENTS \ - ChangeLog gst-plugins-good.doap autogen.sh \ - $(win32) + ChangeLog gst-plugins-good.doap autogen.sh DISTCLEANFILES = _stdint.h @@ -49,15 +45,12 @@ build-checks: true endif -win32-update: - cp $(top_builddir)/win32/common/config.h-new \ - $(top_srcdir)/win32/common/config.h - include $(top_srcdir)/common/coverage/lcov.mak # cruft: plugins that have been merged or moved or renamed CRUFT_FILES = \ + $(top_builddir)/win32/common/config.h-new \ $(top_builddir)/common/shave \ $(top_builddir)/common/shave-libtool \ $(top_builddir)/gst/median/.libs/*.{so,dll,DLL,dylib} \ diff --git a/configure.ac b/configure.ac index f2fb1cfb45..0ef225f24e 100644 --- a/configure.ac +++ b/configure.ac @@ -1087,47 +1087,6 @@ pkgconfig/Makefile pkgconfig/gstreamer-plugins-good-uninstalled.pc gst-plugins-good.spec ) - -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#define GST_INSTALL_PLUGINS_HELPER PREFIX "\\\\libexec\\\\gst-install-plugins-helper.exe"/' \ - -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/.* 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 35c6443cb4..0000000000 --- a/win32/MANIFEST +++ /dev/null @@ -1,2 +0,0 @@ -win32/MANIFEST -win32/common/config.h diff --git a/win32/common/config.h b/win32/common/config.h deleted file mode 100644 index 1a142f06e0..0000000000 --- a/win32/common/config.h +++ /dev/null @@ -1,460 +0,0 @@ -/* Autogenerated config.h created for win32 Visual Studio builds */ - -/* PREFIX -- specifically added for Windows for easier moving */ -#define PREFIX "C:\\gstreamer" - -#define GST_INSTALL_PLUGINS_HELPER PREFIX "\\libexec\\gst-install-plugins-helper.exe" - -/* 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-good-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 - -/* 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 Good 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 if Video4Linux probe shall be run at plugin load */ -#undef GST_V4L2_ENABLE_PROBE - -/* Define to enable aalib ASCII Art library (used by aasink). */ -#undef HAVE_AALIB - -/* Define to 1 if you have the `asinh' function. */ -#undef HAVE_ASINH - -/* Define to enable bz2 library for matroska . */ -#undef HAVE_BZ2 - -/* Define to enable Cairo graphics rendering and gobject bindings (used by - cairo). */ -#undef HAVE_CAIRO - -/* 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 to 1 if you have the `clock_gettime' function. */ -#undef HAVE_CLOCK_GETTIME - -/* Define to 1 if you have the `cosh' function. */ -#undef HAVE_COSH - -/* 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 enable DirectSound plug-in (used by directsoundsink). */ -#undef HAVE_DIRECTSOUND - -/* 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 raw1394 and avc1394 library (used by 1394). */ -#undef HAVE_DV1394 - -/* Define to enable building of experimental plug-ins. */ -#undef HAVE_EXPERIMENTAL - -/* Define to enable building of plug-ins with external deps. */ -#undef HAVE_EXTERNAL - -/* Define to 1 if you have the header file. */ -#undef HAVE_FCNTL_H - -/* FIONREAD ioctl found in sys/filio.h */ -#undef HAVE_FIONREAD_IN_SYS_FILIO - -/* FIONREAD ioctl found in sys/ioclt.h */ -#undef HAVE_FIONREAD_IN_SYS_IOCTL - -/* Define to enable FLAC lossless audio (used by flac). */ -#undef HAVE_FLAC - -/* Define to 1 if you have the `fpclass' function. */ -#undef HAVE_FPCLASS - -/* Define if compiler supports gcc inline assembly */ -#undef HAVE_GCC_ASM - -/* Define to enable GDK pixbuf (used by gdkpixbuf). */ -#undef HAVE_GDK_PIXBUF - -/* Define to 1 if you have the `getpagesize' function. */ -#undef HAVE_GETPAGESIZE - -/* Define if the GNU gettext() function is already present or preinstalled. */ -#undef HAVE_GETTEXT - -/* Define to enable Video 4 Linux 2 (used by video4linux2). */ -#undef HAVE_GST_V4L2 - -/* Whether gudev is available for device detection */ -#undef HAVE_GUDEV - -/* 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 - -/* building for iOS platofrm */ -#undef HAVE_IOS - -/* Define if we have struct ip_mreqn */ -#undef HAVE_IP_MREQN - -/* Define to 1 if you have the `isinf' function. */ -#undef HAVE_ISINF - -/* Define to enable Jack (used by jack). */ -#undef HAVE_JACK - -/* defined if jack >= 0.120.1 is available */ -#undef HAVE_JACK_0_120_1 - -/* defined if jack >= 1.9.7 is available */ -#undef HAVE_JACK_1_9_7 - -/* Define to enable jpeg library (used by jpeg). */ -#undef HAVE_JPEG - -/* Define to enable libcaca coloured ASCII art (used by cacasink). */ -#undef HAVE_LIBCACA - -/* Define to enable libdv DV demuxer/decoder (used by dv). */ -#undef HAVE_LIBDV - -/* Define to enable Portable Network Graphics library (used by png). */ -#undef HAVE_LIBPNG - -/* Whether libv4l2 is available for video buffer conversion */ -#undef HAVE_LIBV4L2 - -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have a working `mmap' system call. */ -#undef HAVE_MMAP - -/* Use Orc */ -#undef HAVE_ORC - -/* Define to enable OSS audio (used by ossaudio). */ -#undef HAVE_OSS - -/* Define to enable Open Sound System 4 (used by oss4). */ -#undef HAVE_OSS4 - -/* Define if OSS includes are in /machine/ */ -#undef HAVE_OSS_INCLUDE_IN_MACHINE - -/* Define if OSS includes are in / */ -#undef HAVE_OSS_INCLUDE_IN_ROOT - -/* Define if OSS includes are in /sys/ */ -#undef HAVE_OSS_INCLUDE_IN_SYS - -/* Define to enable OSX audio (used by osxaudio). */ -#undef HAVE_OSX_AUDIO - -/* Define to enable OSX video (used by osxvideosink). */ -#undef HAVE_OSX_VIDEO - -/* Define to 1 if you have the header file. */ -#define HAVE_PROCESS_H 1 - -/* Define if you have POSIX threads libraries and header files. */ -#undef HAVE_PTHREAD - -/* Have PTHREAD_PRIO_INHERIT. */ -#undef HAVE_PTHREAD_PRIO_INHERIT - -/* Define to enable pulseaudio plug-in (used by pulseaudio). */ -#undef HAVE_PULSE - -/* Define if RDTSC is available */ -#undef HAVE_RDTSC - -/* Define to 1 if you have the `rint' function. */ -#undef HAVE_RINT - -/* Define to enable Shoutcast/Icecast client library (used by shout2). */ -#undef HAVE_SHOUT2 - -/* Define to 1 if you have the `sinh' function. */ -#undef HAVE_SINH - -/* Define to enable soup http client plugin (2.4) (used by souphttpsrc). */ -#undef HAVE_SOUP - -/* Define to enable speex speech codec (used by speex). */ -#undef HAVE_SPEEX - -/* 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 enable Sun Audio (used by sunaudio). */ -#undef HAVE_SUNAUDIO - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_IOCTL_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_PARAM_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_SOCKET_H - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TIME_H - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to enable taglib tagging library (used by taglib). */ -#undef HAVE_TAGLIB - -/* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H - -/* Define if valgrind should be used */ -#undef HAVE_VALGRIND - -/* Defined if the VP8 decoder is available */ -#undef HAVE_VP8_DECODER - -/* Defined if the VP8 encoder is available */ -#undef HAVE_VP8_ENCODER - -/* Defined if the VP9 decoder is available */ -#undef HAVE_VP9_DECODER - -/* Defined if the VP9 encoder is available */ -#undef HAVE_VP9_ENCODER - -/* Define to enable VPX decoder (used by vpx). */ -#undef HAVE_VPX - -/* Defined if the VPX library version is 1.4 or bigger */ -#undef HAVE_VPX_1_4 - -/* Define to enable Win32 WaveForm (used by waveformsink). */ -#undef HAVE_WAVEFORM - -/* Define to enable wavpack plug-in (used by wavpack). */ -#undef HAVE_WAVPACK - -/* Define to enable X libraries and plugins (used by ximagesrc). */ -#undef HAVE_X - -/* Defined if Xdamage is available */ -#undef HAVE_XDAMAGE - -/* Defined if Xfixes is available */ -#undef HAVE_XFIXES - -/* Defined if XShm is available */ -#undef HAVE_XSHM - -/* Define to enable zlib support for qtdemux/matroska. */ -#undef HAVE_ZLIB - -/* 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-good" - -/* 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 Good Plug-ins" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "GStreamer Good Plug-ins 1.10.0" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "gst-plugins-good" - -/* 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 - -/* Define to necessary symbol if this constant uses a non-standard name on - your system. */ -#undef PTHREAD_CREATE_JOINABLE - -/* 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