No need for INCLUDE_INTERNAL_SYMBOLS anymore.

2004-08-17  Matthias Clasen  <mclasen@redhat.com>

	* gtk/abicheck.sh: No need for INCLUDE_INTERNAL_SYMBOLS anymore.

	* gdk/gdk.symbols: Don't use #if defined().

	* gdk/Makefile.am (gdkalias.h):
	* gtk/Makefile.am (gtkalias.h): Don't use cpp to filter gtk.symbols.

	* gdk/makegdkalias.pl:
	* gtk/makegtkalias.pl: Move the #ifdef processing into the perl script, and
	keep the #ifdefs which differentiate between platforms.

	* gtk/Makefile.am (gtk_private_h_sources): Remove gtkinternals.h, it is no
	longer needed.

3 files changed, 66 insertions, 7 deletions

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index fbf7ba481..c8578a00f 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -180,7 +180,7 @@ gdk.def: gdk.symbols
 	(echo -e EXPORTS; cpp -P -DGDK_WINDOWING_WIN32 -DINCLUDE_VARIABLES gdk.symbols | sed -e '/^$$/d' -e 's/^/\t/') > gdk.def
 
 gdkalias.h: gdk.symbols
-	 cpp -P gdk.symbols -DGDK_WINDOWING_X11 | ./makegdkalias.pl > gdkalias.h
+	 ./makegdkalias.pl <gdk.symbols > gdkalias.h
 
 if OS_UNIX
 TESTS = abicheck.sh
diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index 16103aed8..8669507c3 100644
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -285,7 +285,10 @@ gdk_line_style_get_type
 gdk_list_visuals
 gdk_mbstowcs
 gdk_modifier_type_get_type
-#if defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WIN32)
+#ifdef GDK_WINDOWING_X11
+gdk_net_wm_supports
+#endif
+#ifdef GDK_WINDOWING_WIN32
 gdk_net_wm_supports
 #endif
 gdk_notify_startup_complete
diff --git a/gdk/makegdkalias.pl b/gdk/makegdkalias.pl
index f46d21cc1..4a1185f46 100755
--- a/gdk/makegdkalias.pl
+++ b/gdk/makegdkalias.pl
@@ -29,23 +29,79 @@ print <<EOF;
 
 #include "gdk.h"
 
+#ifdef GDK_WINDOWING_X11
 #include "x11/gdkx.h"
+#endif
+#ifdef GDK_WINDOWING_WIN32
+#include "win32/gdkwin32.h"
+#endif
 
 EOF
 
+my $in_comment = 0;
+my $in_skipped_section = 0;
+
 while (<>) {
 
   # ignore empty lines
   next if /^\s*$/;
 
+  # skip comments
+  if ($_ =~ /^\s*\/\*/)
+  {
+      $in_comment = 1;
+  }
+  
+  if ($in_comment)
+  {
+      if ($_ =~  /\*\/\s$/)
+      {
+	  $in_comment = 0;
+      }
+      
+      next;
+  }
+
+  # handle ifdefs
+  if ($_ =~ /^\#endif/)
+  {
+      if (!$in_skipped_section)
+      {
+	  print $_;
+      }
+
+      $in_skipped_section = 0;
+
+      next;
+  }
+
+  if ($_ =~ /^\#ifdef\s+INCLUDE_VARIABLES/)
+  {
+      $in_skipped_section = 1;
+  }
+
+  if ($in_skipped_section)
+  {
+      next;
+  }
+
+  if ($_ =~ /^\#ifdef\s+G/)
+  {
+      print $_;
+      
+      next;
+  }
+
   my $str = $_;
   chomp($str);
   my $alias = $str."__internal_alias";
-  
-  print "extern __typeof ($str) $alias __attribute((visibility(\"hidden\"))); \n";
-  print "extern __typeof ($str) $str __attribute((alias(\"$alias\"), visibility(\"default\"))); \n";
-  print "#define $str $alias \n";
-  print "\n";
+ 
+  print <<EOF
+extern __typeof ($str) $alias __attribute((visibility("hidden")));
+extern __typeof ($str) $str __attribute((alias("$alias"), visibility("default")));
+\#define $str $alias
+
+EOF
 }
 
 print <<EOF;