AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-05 16:20:10 +00:00
Code Issues Projects Releases Wiki Activity

Don't install private headers. (#463510)

Browse Source 
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.



svn path=/trunk/; revision=19595
This commit is contained in:
Matthias Clasen 2008-02-16 04:33:48 +00:00 committed by Matthias Clasen
parent 3456639c39
commit 580ae3106d
4 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
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.
2008-02-15 Matthias Clasen <mclasen@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_stop_reorder): Prevent

33
gdk/Makefile.am
View File

@ -17,7 +17,6 @@ EXTRA_DIST += \
makefile.msc \
gdk.symbols \
makegdkalias.pl \
gdkaliasdef.c \
gdkenumtypes.c.template \
gdkenumtypes.h.template \
abicheck.sh \
@ -83,6 +82,7 @@ gdk_public_h_sources = \
gdkpango.h \
gdkpixbuf.h \
gdkpixmap.h \
gdkprivate.h \
gdkproperty.h \
gdkregion.h \
gdkrgb.h \
@ -94,10 +94,10 @@ gdk_public_h_sources = \
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 @@ gdk_c_sources = \
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 @@ lib_LTLIBRARIES = $(gdktargetlib)
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 @@ if DISABLE_EXPLICIT_DEPS
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

9
gdk/gdkinternals.h
View File

@ -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

3
gdk/gdkprivate.h
View File

@ -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