Remove ugly usage of vlc_symbols.h when building libvlc as a shared library

include/vlc_common.h

@@ -440,7 +440,7 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *,      /* variable's object */
 /*****************************************************************************
  * Plug-in stuff
  *****************************************************************************/
-#ifndef __PLUGIN__
+#if !defined (__PLUGIN__) || defined (HAVE_SHARED_LIBVLC)
 #   define VLC_EXPORT( type, name, args ) type name args
 #else
 #   define VLC_EXPORT( type, name, args ) struct _u_n_u_s_e_d_
@@ -1130,7 +1130,9 @@ VLC_EXPORT( const char *, VLC_Error, ( int ) );
 /*****************************************************************************
  * Additional vlc stuff
  *****************************************************************************/
-#include "vlc_symbols.h"
+#ifndef HAVE_SHARED_LIBVLC
+#   include "vlc_symbols.h"
+#endif
 #include "os_specific.h"
 #include "vlc_messages.h"
 #include "variables.h"

vlc-api.pl

@@ -55,29 +55,8 @@ print { $new_sym }
 	"# define __VLC_SYMBOLS_H\n".
 	"\n".
 	"# ifdef HAVE_SHARED_LIBVLC\n".
-	"/*\n".
-	" * In an ideal world, plugins would include all the headers they need.\n".
-	" * But of course, many, if not all, of them don't, so we have to make sure\n".
-	" * the whole libvlc API is defined here in any case when included from a\n".
-	" * plugin.\n".
-	" */\n".
-	"#  ifdef __PLUGIN__\n".
-	"#   ifdef __cplusplus\n".
-	"extern \"C\" {\n".
-	"#   endif\n";
-
-foreach (keys %new_APIs)
-{
-	print { $new_sym }
-		$new_APIs{$_}[0]." $_ (".$new_APIs{$_}[1].");\n";
-}
-
-print { $new_sym }
-	"#   ifdef __cplusplus\n".
-	"}\n".
-	"#   endif\n".
-	"#  endif /* __PLUGIN__ */\n".
-	"# else /* HAVE_LIBVLC_SHARED */\n".
+	"#  error You are not supposed to include this file!\n".
+	"# endif\n".
 	"/*\n".
 	" * This is the big VLC API structure for plugins :\n".
 	" * Changing its layout breaks plugin's binary compatibility,\n".
@@ -179,7 +158,7 @@ foreach (keys %new_APIs)
 #
 print { $new_sym }
 	"};\n".
-	"#  if defined (__PLUGIN__)\n";
+	"# if defined (__PLUGIN__)\n";
 
 foreach (@API)
 {
@@ -187,11 +166,11 @@ foreach (@API)
 }
 
 print { $new_sym }
-	"#  elif defined (HAVE_DYNAMIC_PLUGINS) && !defined (__BUILTIN__)\n".
+	"# elif defined (HAVE_DYNAMIC_PLUGINS) && !defined (__BUILTIN__)\n".
 	"/******************************************************************\n".
 	" * STORE_SYMBOLS: store VLC APIs into p_symbols for plugin access.\n".
 	" ******************************************************************/\n".
-	"#   define STORE_SYMBOLS( p_symbols ) \\\n";
+	"#  define STORE_SYMBOLS( p_symbols ) \\\n";
 
 foreach (@API)
 {
@@ -204,8 +183,7 @@ foreach (@deprecated_API)
 
 print { $new_sym }
 	"\n".
-	"#  endif /* __PLUGIN__ */\n".
-	"# endif /* HAVE_SHARED_LIBVLC */\n".
+	"# endif /* __PLUGIN__ */\n".
 	"#endif /* __VLC_SYMBOLS_H */\n";
 close $new_sym;