gst-libs/gst/: remove silly include
authorThomas Vander Stichele <thomas@apestaart.org>
Sun, 27 Nov 2005 16:27:20 +0000 (16:27 +0000)
committerThomas Vander Stichele <thomas@apestaart.org>
Sun, 27 Nov 2005 16:27:20 +0000 (16:27 +0000)
Original commit message from CVS:

* gst-libs/gst/net/Makefile.am:
* gst-libs/gst/rtp/Makefile.am:
* gst-libs/gst/tag/Makefile.am:
remove silly include
* gst/tags/Makefile.am:
* gst/tags/gsttagediting.c:
* gst/tags/gsttageditingprivate.h:
* gst/tags/tagedit.vcproj:
remove directory, is as good as empty

ChangeLog
gst-libs/gst/net/Makefile.am
gst-libs/gst/netbuffer/Makefile.am
gst-libs/gst/rtp/Makefile.am
gst-libs/gst/tag/Makefile.am
gst/tags/Makefile.am [deleted file]
gst/tags/gsttagediting.c [deleted file]
gst/tags/gsttageditingprivate.h [deleted file]
gst/tags/tagedit.vcproj [deleted file]

index cab0e2d..80df005 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2005-11-27  Thomas Vander Stichele  <thomas at apestaart dot org>
 
+       * gst-libs/gst/net/Makefile.am:
+       * gst-libs/gst/rtp/Makefile.am:
+       * gst-libs/gst/tag/Makefile.am:
+         remove silly include
+       * gst/tags/Makefile.am:
+       * gst/tags/gsttagediting.c:
+       * gst/tags/gsttageditingprivate.h:
+       * gst/tags/tagedit.vcproj:
+         remove directory, is as good as empty
+
+2005-11-27  Thomas Vander Stichele  <thomas at apestaart dot org>
+
        * configure.ac:
          added GST_LIB_LDFLAGS and GST_ALL_LDFLAGS
        * gst-libs/Makefile.am:
index 0822f9a..be0dcdc 100644 (file)
@@ -5,7 +5,6 @@ libgstnetinclude_HEADERS = gstnetbuffer.h
 lib_LTLIBRARIES = libgstnet-@GST_MAJORMINOR@.la
 
 libgstnet_@GST_MAJORMINOR@_la_SOURCES = gstnetbuffer.c
-# FIXME: what is that include doing here ???
-libgstnet_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) -I$(top_srcdir)/gst/tags
+libgstnet_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS)
 libgstnet_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS)
 libgstnet_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
index 0822f9a..be0dcdc 100644 (file)
@@ -5,7 +5,6 @@ libgstnetinclude_HEADERS = gstnetbuffer.h
 lib_LTLIBRARIES = libgstnet-@GST_MAJORMINOR@.la
 
 libgstnet_@GST_MAJORMINOR@_la_SOURCES = gstnetbuffer.c
-# FIXME: what is that include doing here ???
-libgstnet_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) -I$(top_srcdir)/gst/tags
+libgstnet_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS)
 libgstnet_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS)
 libgstnet_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
index 77d8d68..ea02606 100644 (file)
@@ -10,7 +10,6 @@ libgstrtp_@GST_MAJORMINOR@_la_SOURCES = gstrtpbuffer.c \
                                gstbasertppayload.c \
                                gstbasertpdepayload.c
 
-# FIXME: what is that include doing here ?
-libgstrtp_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) -I$(top_srcdir)/gst/tags
+libgstrtp_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS)
 libgstrtp_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS)
 libgstrtp_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
index 8e62e5a..721fb62 100644 (file)
@@ -7,7 +7,7 @@ libgsttaginclude_HEADERS = \
 lib_LTLIBRARIES = libgsttag-@GST_MAJORMINOR@.la
 
 libgsttag_@GST_MAJORMINOR@_la_SOURCES = gstvorbistag.c gstid3tag.c
-libgsttag_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) -I$(top_srcdir)/gst/tags
+libgsttag_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS)
 libgsttag_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) 
 libgsttag_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
 
diff --git a/gst/tags/Makefile.am b/gst/tags/Makefile.am
deleted file mode 100644 (file)
index fbd53d2..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-plugin_LTLIBRARIES = libgsttagedit.la
-
-libgsttagedit_la_SOURCES = gsttagediting.c
-libgsttagedit_la_CFLAGS = $(GST_CFLAGS) -I$(top_srcdir)/gst/tags
-libgsttagedit_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgsttagedit_la_LIBADD = $(GST_LIBS) 
-
-noinst_HEADERS = gsttageditingprivate.h
diff --git a/gst/tags/gsttagediting.c b/gst/tags/gsttagediting.c
deleted file mode 100644 (file)
index 8ed7d4b..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/* GStreamer
- * Copyright (C) 2003 Benjamin Otte <in7y118@public.uni-hamburg.de>
- *
- * gsttagediting.c: tag editing plugin
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
-#include "gsttageditingprivate.h"
-#include <gst/gst.h>
-
-static gboolean
-plugin_init (GstPlugin * plugin)
-{
-  if (!gst_element_register (plugin, "vorbistag",
-          GST_RANK_PRIMARY, gst_vorbis_tag_get_type ())) {
-    return FALSE;
-  }
-
-  return TRUE;
-}
-
-GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
-    GST_VERSION_MINOR,
-    "gsttags",
-    "elements for manipulating data from ogg streams",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/tags/gsttageditingprivate.h b/gst/tags/gsttageditingprivate.h
deleted file mode 100644 (file)
index 04ae4f8..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-/* GStreamer
- * Copyright (C) 2003 Benjamin Otte <in7y118@public.uni-hamburg.de>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_TAG_EDIT_PRIVATE_H__
-#define __GST_TAG_EDIT_PRIVATE_H__
-
-#include <gst/tag/tag.h>
-
-G_BEGIN_DECLS
-  
-
-typedef struct _GstTagEntryMatch GstTagEntryMatch;
-struct _GstTagEntryMatch {
-  gchar *      gstreamer_tag;
-  gchar *      original_tag;
-};
-
-
-GType gst_vorbis_tag_get_type (void);
-
-
-G_END_DECLS
-
-#endif /* __GST_TAG_EDIT_PRIVATE_H__ */
diff --git a/gst/tags/tagedit.vcproj b/gst/tags/tagedit.vcproj
deleted file mode 100644 (file)
index 274527d..0000000
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="7.10"
-       Name="tagedit"
-       ProjectGUID="{979C216F-0ACF-4956-AE00-055A42D678D0}"
-       Keyword="Win32Proj">
-       <Platforms>
-               <Platform
-                       Name="Win32"/>
-       </Platforms>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory="../../win32/Debug"
-                       IntermediateDirectory="../../win32/Debug"
-                       ConfigurationType="2"
-                       CharacterSet="2">
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="../../../gstreamer/win32;../../../gstreamer;../../../gstreamer/libs;../../../glib;../../../glib/glib;../../../glib/gmodule;&quot;../../gst-libs&quot;;../../../popt/include;../../../libxml2/include/libxml2"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;tagedit_EXPORTS;HAVE_CONFIG_H;_USE_MATH_DEFINES"
-                               MinimalRebuild="TRUE"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               Detect64BitPortabilityProblems="TRUE"
-                               DebugInformationFormat="4"/>
-                       <Tool
-                               Name="VCCustomBuildTool"/>
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="glib-2.0.lib gmodule-2.0.lib gthread-2.0.lib gobject-2.0.lib libgstreamer.lib gstbytestream.lib iconv.lib intl.lib"
-                               OutputFile="$(OutDir)/gsttagedit.dll"
-                               LinkIncremental="2"
-                               AdditionalLibraryDirectories="../../../gstreamer/win32/Debug;../../../glib/glib;../../../glib/gmodule;../../../glib/gthread;../../../glib/gobject;../../../gettext/lib;../../../libiconv/lib"
-                               ModuleDefinitionFile=""
-                               GenerateDebugInformation="TRUE"
-                               ProgramDatabaseFile="$(OutDir)/tagedit.pdb"
-                               SubSystem="2"
-                               OptimizeReferences="2"
-                               ImportLibrary="$(OutDir)/gsttagedit.lib"
-                               TargetMachine="1"/>
-                       <Tool
-                               Name="VCMIDLTool"/>
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                               CommandLine="copy /Y $(TargetPath) c:\gstreamer\plugins"/>
-                       <Tool
-                               Name="VCPreBuildEventTool"/>
-                       <Tool
-                               Name="VCPreLinkEventTool"/>
-                       <Tool
-                               Name="VCResourceCompilerTool"/>
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"/>
-                       <Tool
-                               Name="VCWebDeploymentTool"/>
-                       <Tool
-                               Name="VCManagedWrapperGeneratorTool"/>
-                       <Tool
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory="../../win32/Release"
-                       IntermediateDirectory="../../win32/Release"
-                       ConfigurationType="2"
-                       CharacterSet="2">
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="../../../gstreamer/win32;../../../gstreamer;../../../gstreamer/libs;../../../glib;../../../glib/glib;../../../glib/gmodule;&quot;../../gst-libs&quot;;../../../popt/include;../../../libxml2/include/libxml2"
-                               PreprocessorDefinitions="WIN32;NDEBUG;GST_DISABLE_GST_DEBUG;_WINDOWS;_USRDLL;tagedit_EXPORTS;HAVE_CONFIG_H;_USE_MATH_DEFINES"
-                               RuntimeLibrary="2"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               Detect64BitPortabilityProblems="TRUE"
-                               DebugInformationFormat="3"/>
-                       <Tool
-                               Name="VCCustomBuildTool"/>
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="glib-2.0.lib gmodule-2.0.lib gthread-2.0.lib gobject-2.0.lib libgstreamer.lib gstbytestream.lib iconv.lib intl.lib"
-                               OutputFile="$(OutDir)/gsttagedit.dll"
-                               LinkIncremental="1"
-                               AdditionalLibraryDirectories="../../../gstreamer/win32/Release;../../../glib/glib;../../../glib/gmodule;../../../glib/gthread;../../../glib/gobject;../../../gettext/lib;../../../libiconv/lib"
-                               ModuleDefinitionFile=""
-                               GenerateDebugInformation="TRUE"
-                               SubSystem="2"
-                               OptimizeReferences="2"
-                               EnableCOMDATFolding="2"
-                               ImportLibrary="$(OutDir)/gsttagedit.lib"
-                               TargetMachine="1"/>
-                       <Tool
-                               Name="VCMIDLTool"/>
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                               CommandLine="copy /Y $(TargetPath) c:\gstreamer\plugins"/>
-                       <Tool
-                               Name="VCPreBuildEventTool"/>
-                       <Tool
-                               Name="VCPreLinkEventTool"/>
-                       <Tool
-                               Name="VCResourceCompilerTool"/>
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"/>
-                       <Tool
-                               Name="VCWebDeploymentTool"/>
-                       <Tool
-                               Name="VCManagedWrapperGeneratorTool"/>
-                       <Tool
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter
-                       Name="Source Files"
-                       Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-                       <File
-                               RelativePath=".\gstvorbistag.c">
-                       </File>
-                       <File
-                               RelativePath=".\gsttagediting.c">
-                       </File>
-                       <File
-                               RelativePath=".\gstid3tag.c">
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Header Files"
-                       Filter="h;hpp;hxx;hm;inl;inc;xsd"
-                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-                       <File
-                               RelativePath=".\gsttageditingprivate.h">
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Resource Files"
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
-               </Filter>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>