gtk+ r19595 - in trunk: . gdk

[matthiasc svn gnome org]

Author: matthiasc
Date: Sat Feb 16 04:33:48 2008
New Revision: 19595
URL: http://svn.gnome.org/viewvc/gtk+?rev=19595&view=rev

Log:
2008-02-15  Matthias Clasen  <mclasen redhat com>

        * gdk/Makefile.am: Don't install private headers. (#463510)

        * gdk/gdkinternal.h: Include gdkmedialib.h here, not in
        the installed header gdkprivate.h.




Modified:
   trunk/ChangeLog
   trunk/gdk/Makefile.am
   trunk/gdk/gdkinternals.h
   trunk/gdk/gdkprivate.h

Modified: trunk/gdk/Makefile.am
==============================================================================
--- trunk/gdk/Makefile.am	(original)
+++ trunk/gdk/Makefile.am	Sat Feb 16 04:33:48 2008
@@ -17,7 +17,6 @@
 	makefile.msc		\
 	gdk.symbols		\
 	makegdkalias.pl		\
-	gdkaliasdef.c		\
 	gdkenumtypes.c.template	\
 	gdkenumtypes.h.template	\
 	abicheck.sh		\
@@ -83,6 +82,7 @@
 	gdkpango.h				\
 	gdkpixbuf.h				\
 	gdkpixmap.h				\
+	gdkprivate.h				\
 	gdkproperty.h				\
 	gdkregion.h				\
 	gdkrgb.h				\
@@ -94,10 +94,10 @@
 	gdkvisual.h				\
 	gdkwindow.h
 
-gdk_headers =                     \
-	$(gdk_public_h_sources)   \
-	gdkenumtypes.h		  \
-	gdkprivate.h		  \
+gdk_built_public_sources =			\
+	gdkenumtypes.h
+
+gdk_built_private_headers =			\
 	gdkalias.h
 
 gdk_c_sources =                 \
@@ -135,12 +135,20 @@
 	gdkvisual.c		\
 	gdkwindow.c
 
+gdk_built_sources =				\
+	gdkaliasdef.c				\
+	gdkenumtypes.c				\
+	gdkmarshalers.h 			\
+	gdkmarshalers.c				\
+	$(gdk_built_public_sources)		\
+	$(gdk_built_private_headers)
+
 #
 # setup GDK sources and their dependencies
 #
 
 gdkincludedir = $(includedir)/gtk-2.0/gdk
-gdkinclude_HEADERS = $(gdk_headers)
+gdkinclude_HEADERS = $(gdk_public_h_sources) $(gdk_built_public_sources)
 
 # gdkmarshalers.c is not here because it is currently an empty file
 common_sources =                \
@@ -213,8 +221,8 @@
 
 EXTRA_LTLIBRARIES = libgdk-x11-2.0.la libgdk-win32-2.0.la libgdk-quartz-2.0.la libgdk-directfb-2.0.la
 
-MAINTAINERCLEANFILES = gdkenumtypes.h stamp-gdkenumtypes.h gdkenumtypes.c \
-  gdkmarshalers.h gdkmarshalers.c
+MAINTAINERCLEANFILES = $(gdk_built_sources) stamp-gdkenumtypes.h
+EXTRA_DIST += $(gdk_built_sources)
 EXTRA_HEADERS =
 
 #
@@ -235,13 +243,8 @@
 endif
 
 #note: not gdkconfig.h
-BUILT_SOURCES =					\
-	gdkalias.h				\
-	gdkaliasdef.c				\
-	gdkenumtypes.h				\
-	gdkenumtypes.c				\
-	gdkmarshalers.h 			\
-	gdkmarshalers.c				\
+BUILT_SOURCES = \
+	$(gdk_built_sources)			\
 	gdkconfig.h
 
 gdkenumtypes.h: stamp-gdkenumtypes.h

Modified: trunk/gdk/gdkinternals.h
==============================================================================
--- trunk/gdk/gdkinternals.h	(original)
+++ trunk/gdk/gdkinternals.h	Sat Feb 16 04:33:48 2008
@@ -26,13 +26,16 @@
 
 /* Uninstalled header defining types and functions internal to GDK */
 
+#ifndef __GDK_INTERNALS_H__
+#define __GDK_INTERNALS_H__
+
 #include <gio/gio.h>
 #include <gdk/gdktypes.h>
 #include <gdk/gdkwindow.h>
 #include <gdk/gdkprivate.h>
-
-#ifndef __GDK_INTERNALS_H__
-#define __GDK_INTERNALS_H__
+#ifdef USE_MEDIALIB
+#include <gdk/gdkmedialib.h>
+#endif
 
 G_BEGIN_DECLS
 

Modified: trunk/gdk/gdkprivate.h
==============================================================================
--- trunk/gdk/gdkprivate.h	(original)
+++ trunk/gdk/gdkprivate.h	Sat Feb 16 04:33:48 2008
@@ -35,9 +35,6 @@
 #include <gdk/gdkregion.h>
 #include <gdk/gdkvisual.h>
 #include <gdk/gdkwindow.h>
-#ifdef USE_MEDIALIB
-#include <gdk/gdkmedialib.h>
-#endif
 
 G_BEGIN_DECLS