mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-12-26 13:41:07 +00:00
1bbf2ac7ee
Fri Sep 7 11:51:44 2001 Owen Taylor <otaylor@redhat.com>
Make gdkx.h the only installed header from gdk/x11.
All structures in gdk/x11 are opaque.
* gdk/x11/Makefile.am gdk/x11/gdkx.h gdk/x11/gdkprivate-x11.h:
Don't install gdk{drawable,pixmap,window}-x11.h.
* gdk/x11/{gdkcolormap-x11.c, gdkfont-x11.c, gdkx.h, gdkvisual-x11.c:
Move GdkColormapPrivateX11, GdkFontPrivateX GdkImagePrivateX11,
GdkVisualClass into C files.
* gdk/gdkpixmap-x11.[ch]: Make gdk_pixmap_impl_get_type() static.
* gdk/x11/{gdkcolor-x11.c, gdkcursor-x11.c, gdkdrawable-x11.c,
gdkfont-x11.c, gdkgc-x11.c, gdkx.h, gdkimage-x11,gdkvisual-x11.c}
Add public functions to replace previously exported direct
structure access.
gdk_x11_colormap_get_{xdisplay,xcolormap}
gdk_x11_cursor_get_{xdisplay,xcursor},
gdk_x11_drawable_get_{xdisplay,xcursor,gdk_x11_visual_get_xvisual,
gdk_x11_font_get_{xdisplay,xfont}, gdk_x11_image_get_{xdisplay,ximage},
gdk_x11_gc_get_{xdisplay,ximage}
* gdk/gdkprivate.h gdk/gdkinternals.h: Move GdkColorInfo,
GdkEventFilter, GdkClientFilter, GdkFontPrivate to gdkinternals.
Fix a number of variables and functions that were exported
"accidentally" from GDK.
* gdk/**.[ch]: gdk => _gdk for gdk_visual_init,
gdk_events_init, gdk_input_init, gdk_dnd_init, gdk_image_exit,
gdk_input_exit, gdk_windowing_exit, gdk_event_func, gdk_event_data,
gdk_event_notify, gdk_queued_events, gdk_queued_tail,
gdk_event_new, gdk_events_queue, gdk_events_unqueue,
gdk_event_queue_find_first, gdk_event_queue_remove_link,
gdk_event_queue_append, gdk_event_button_generate,
gdk_debug_flags, gdk_default_filters, gdk_parent_root.
* gdk/x11/{gdkevents-x11.c, gdkglobals-x11.c, gdkimage-x11.c,
gdkmain-x11.c, gdkprivate-x11.h, gdk/x11/gdkwindow-x11.c}:
gdk => _gdk for gdk_event_mask_table, gkd_nevent_masks,
gdk_wm_window_protocols, gdk_leader_window, gdk_xgrab_window,
gdk_use_xshm, gdk_input_ignore_core.
* gdk/x11/xsettings-common.h (xsettings_list_insert): Add
#defines to namespace functions into the private _gdk_
namespace.
* gdk/gdkwindow.[ch] gdk/x11/gdkx.h: Add gdk_get_default_root_window ()
to replace gdk_parent_root exported variable. Adjust and
deprecate GDK_ROOT_PARENT().
* demos/{testpixbuf-drawable.c,testpixbuf-save.c}: Fix
GDK_ROOT_PARENT usage, remove includes of port-specific
headers.
* gdk/{win32,x11,fb}/gdkinput*.[ch]: s/gdk/_gdk/ for
_gdk_input_gxid_host, _gdk_input_gxid_port, _gdk_input_ignore_core,
gdk_input_devices, _gdk_input_windows, gdk_init_input_core.
* gdk/x11/{gdkevents-x11.,c gdkglobals-x11.c, gdkmain-x11.c}
docs/Changes-2.0.txt: Remove gdk_wm_protocols,
gdk_wm_delete_window functions, gdk_wm_take_focus,
use gdk_atom_intern() instead.
* gdk/linux-fb/{gdkselection-fb.c, gdkmain-fb.c, gdkprivatefb.h}
gdk/win32/{gdkselection-win32.c, gdkmgdkwin32.h, gdkprivate-win32.h}
gdk/x11/{gdkselection-x11.c gdkx.h, gtkprivate-x11.h}
gtk/gtkselection.c
Unexport gdk_selection_property, just use
gdk_atom_intern ("GDK_SELECTION").
* gdk/x11/{gdkprivate-x11.h,gdkdrawable-x11h,gdkgc-x11.c,gdkx.h}:
Unexport gdk_drawable_impl_x11_get_type, gdk_gc_x11_get_type,
GDK_GC_X11 cast macros, GdkGCX11 structures, GdkCursorPrivate,
GdkVisualprivate, gdk_x11_gc_flush.
Make a number of public exports of variables into functions
to increase encapsulation.
* gdk/gdkinternals.h gdk/gdkinput.h gdk/gdkevents.h
gdk/linux-fb/gdkmouse-fb.c: gdk_core_pointer => _gdk_core_pointer,
move to gdkinternals.h. Add gdk_device_get_core_pointer ().
* gdk/gdkprivate.h gdk/gdkpango.c gdk/gdkinternals.h
docs/Changes-2.0.txt: Unexport gdk_parent_root, gdk_error_code,
gdk_error_warnings.
* gdk/x11/{gdkcolormap-x11.c, gdkmain-x11.c, gdkx.h}
docs/Changes-2.0.txt:
s/gdk_screen/_gdk_screen/, add gdk_x11_get_default_screen()
s/gdk_root_window/_gdk_root_window/, add gdk_x11_get_default_root_xwindow()
Add gdk_x11_get_default_xdisplay().
* gdk/gdk.h gdk/gdk.c linux-fb/gdkfb.h linux-fb/gdkglobals-fb.c
win32/gdkwin32.h x11/gdkglobals-x11.c gdk/x11/gdkmain-x11.c
gdk/x11/gdkx.h: gdk/gdk.def: Add gdk_get/set_program_class,
Don't export gdk_progclass, move --class command line
option and handling to common portion of GDK.
Miscellaneous fixes:
* gdk/x11/gdkwindow-x11.c (gdk_window_set_icon_list): Fix
g_return_val_if_fail that should have been g_return_if_fail.
* gdk/gdkinternals.h gdk/gdkprivate.h: Move
gdk_synthesize_window_state() to the semi-public gdkprivate.h.
* gtk/gtkdnd.c (_gtk_drag_source_handle_event): Remove uneeded
X11 dependency.
* gdk/linux-fb/gdkmain-fb.c gdk/win32/gdkmain-win32.c gdk/TODO:
Remove unused gdk_key_repeat_disable/restore.
* linux-fb/gdkglobals-fb.c win32/gdkglobals-win32.c
x11/gdkglobals-x11.c x11/gdkprivate-x11.h gdk/gdk.def:
Remove unused gdk_null_window_warnings variable.
* gdk/Makefile.am (DIST_SUBDIRS) nanox/*: cvs remove nanox;
it can be retrieved from the repository; it is too far
from functional to be worth having people check out;
it would be easier to start from scratch, I suspect.
* gdk/x11/gdkpixmap-x11.c: Fix lvalue usage of GDK_PIXMAP_XID().
* gdk/x11/gdkkeys-x11.c gdk/gdkrgb.c gdk/gdkwindow.c
gdk/x11/gdkpango-x11.c gdk/x11/gdkselection-x11.c:
Fix some accidentally global variables and unused global variables.
* gdk/x11/gdkkeys-x11.c gdk/gdkrgb.c gdk/gdkwindow.c
gdk/x11/gdkpango-x11.c gdk/x11/gdkselection-x11.c:
Fix some accidentally global variables and unused global variables.
Add some space for future expansion to multihead.
* gdk/gdkdrawable.h: Add four reserved function pointers
for future expansion of GdkDrawableClass.
* gtk/gtkwindow.h gtk/gtkinvisible.h: Add reserved pointer
where we can put a GdkScreen * later.
198 lines
4.7 KiB
Makefile
198 lines
4.7 KiB
Makefile
## Makefile.am for gtk+/gdk
|
|
|
|
SUBDIRS=$(gdktarget)
|
|
DIST_SUBDIRS=linux-fb win32 x11
|
|
|
|
EXTRA_DIST = \
|
|
gdkconfig.h.win32 \
|
|
gdk.def \
|
|
makefile.mingw \
|
|
makefile.mingw.in \
|
|
makeenums.pl \
|
|
makefile.msc
|
|
|
|
common_includes = @STRIP_BEGIN@ \
|
|
-DG_LOG_DOMAIN=\"Gdk\" \
|
|
-I$(top_srcdir) \
|
|
-I$(top_builddir)/gdk \
|
|
-I$(top_srcdir)/gdk-pixbuf \
|
|
@GTK_DEBUG_FLAGS@ \
|
|
@GDK_DEP_CFLAGS@ \
|
|
@STRIP_END@
|
|
|
|
INCLUDES = $(common_includes)
|
|
gtarget=@gdktarget@
|
|
|
|
# libtool stuff: set version and export symbols for resolving
|
|
# since automake doesn't support conditionalized libsomething_la_LDFLAGS
|
|
# we use the general approach here
|
|
LDFLAGS = @STRIP_BEGIN@ \
|
|
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
|
|
-export-dynamic \
|
|
-rpath @prefix@/lib \
|
|
@LIBTOOL_EXPORT_OPTIONS@ \
|
|
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la \
|
|
@GDK_DEP_LIBS@ \
|
|
@STRIP_END@
|
|
|
|
#
|
|
# setup source file variables
|
|
#
|
|
#
|
|
# GDK header files for public installation (non-generated)
|
|
#
|
|
# Note: files added here may need to be be propagated to gdk_headers in gtk/Makefile.am
|
|
#
|
|
gdk_public_h_sources = @STRIP_BEGIN@ \
|
|
gdk.h \
|
|
gdkcolor.h \
|
|
gdkcursor.h \
|
|
gdkcursors.h \
|
|
gdkdnd.h \
|
|
gdkdrawable.h \
|
|
gdkevents.h \
|
|
gdkfont.h \
|
|
gdkgc.h \
|
|
gdkkeysyms.h \
|
|
gdki18n.h \
|
|
gdkimage.h \
|
|
gdkinput.h \
|
|
gdkkeys.h \
|
|
gdkpango.h \
|
|
gdkpixbuf.h \
|
|
gdkpixmap.h \
|
|
gdkproperty.h \
|
|
gdkregion.h \
|
|
gdkrgb.h \
|
|
gdkselection.h \
|
|
gdktypes.h \
|
|
gdkvisual.h \
|
|
gdkwindow.h \
|
|
@STRIP_END@
|
|
|
|
gdk_headers = @STRIP_BEGIN@ \
|
|
$(gdk_public_h_sources) \
|
|
gdkenumtypes.h \
|
|
gdkprivate.h \
|
|
@STRIP_END@
|
|
|
|
gdk_c_sources = @STRIP_BEGIN@ \
|
|
gdk.c \
|
|
gdkcolor.c \
|
|
gdkcursor.c \
|
|
gdkdraw.c \
|
|
gdkevents.c \
|
|
gdkfont.c \
|
|
gdkgc.c \
|
|
gdkglobals.c \
|
|
gdkkeys.c \
|
|
gdkkeyuni.c \
|
|
gdkimage.c \
|
|
gdkinternals.h \
|
|
gdkpango.c \
|
|
gdkpixbuf-drawable.c \
|
|
gdkpixbuf-render.c \
|
|
gdkpixmap.c \
|
|
gdkpoly-generic.h \
|
|
gdkpolyreg-generic.c \
|
|
gdkrgb.c \
|
|
gdkrectangle.c \
|
|
gdkregion-generic.c \
|
|
gdkregion-generic.h \
|
|
gdkwindow.c \
|
|
@STRIP_END@
|
|
|
|
#
|
|
# setup GDK sources and their dependancies
|
|
#
|
|
extra = @gdktargetlib@
|
|
|
|
if USE_X11
|
|
libgdk_x11_includedir = $(includedir)/gtk-2.0/gdk
|
|
|
|
libgdk_x11_1_3_la_LIBADD = \
|
|
$(gtarget)/libgdk-$(gtarget).la
|
|
|
|
libgdk_x11_include_HEADERS = $(gdk_headers)
|
|
libgdk_x11_1_3_la_SOURCES = $(gdk_c_sources) gdkenumtypes.c
|
|
endif
|
|
|
|
if USE_NANOX
|
|
libgdk_nanox_includedir = $(includedir)/gtk-2.0/gdk
|
|
|
|
libgdk_nanox_1_3_la_LIBADD = \
|
|
$(gtarget)/libgdk-$(gtarget).la
|
|
|
|
libgdk_nanox_include_HEADERS = $(gdk_headers)
|
|
libgdk_nanox_1_3_la_SOURCES = $(gdk_c_sources) gdkenumtypes.c
|
|
endif
|
|
|
|
if USE_LINUX_FB
|
|
libgdk_linux_fb_includedir = $(includedir)/gtk-2.0/gdk
|
|
|
|
libgdk_linux_fb_1_3_la_LIBADD = \
|
|
$(gtarget)/libgdk-$(gtarget).la
|
|
|
|
libgdk_linux_fb_include_HEADERS = $(gdk_headers)
|
|
libgdk_linux_fb_1_3_la_SOURCES = $(gdk_c_sources) gdkenumtypes.c
|
|
endif
|
|
|
|
# now define the real one to workaround automake's mishandling
|
|
lib_LTLIBRARIES = $(extra)
|
|
|
|
EXTRA_LTLIBRARIES = libgdk-x11-1.3.la libgdk-nanox-1.3.la libgdk-linux-fb-1.3.la
|
|
|
|
MAINTAINERCLEANFILES +=
|
|
EXTRA_HEADERS +=
|
|
EXTRA_DIST +=
|
|
EXTRA_DIST +=
|
|
|
|
#
|
|
# rules to generate built sources
|
|
#
|
|
# we only need to remake these headers once a new X version is released
|
|
X-derived-headers:
|
|
sed -e 's/^#define[ ]*XC\([^ ]*\)[ ]*\([^ ]*\)[ ]*.*$$/GDK\1 = \2,/' \
|
|
-e 'tb' -e 'd' -e ':b' \
|
|
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \
|
|
< @x_includes@/X11/cursorfont.h > gdkcursors.h ; \
|
|
sed -e 's/^#define[ ]*XK\([^ ]*\)[ ]*\([^ ]*\)[ ]*.*$$/#define GDK\1 \2/' \
|
|
-e 'tb' -e 'd' -e ':b' -e 's/ 0X/ 0x/' \
|
|
< @x_includes@/X11/keysymdef.h > gdkkeysyms.h
|
|
|
|
#
|
|
# Rule to install gdkconfig.h header file
|
|
#
|
|
configexecincludedir = $(libdir)/gtk-2.0/include
|
|
#configexecinclude_DATA = gdkconfig.h
|
|
install-exec-local: gdkconfig.h
|
|
$(mkinstalldirs) $(DESTDIR)$(configexecincludedir)
|
|
file=$(DESTDIR)$(configexecincludedir)/gdkconfig.h; \
|
|
if test -r $$file && cmp -s gdkconfig.h $$file; then :; \
|
|
else $(INSTALL_DATA) gdkconfig.h $$file; fi
|
|
|
|
#note: not gdkconfig.h
|
|
BUILT_SOURCES = stamp-gc-h @REBUILD@ gdkenumtypes.c gdkenumtypes.h
|
|
|
|
gdkenumtypes.h: @REBUILD@ $(gdk_public_h_sources) $(srcdir)/makeenums.pl
|
|
cd $(srcdir) \
|
|
&& $(PERL) ./makeenums.pl include $(gdk_public_h_sources) > gdkenumtypes.h
|
|
|
|
gdkenumtypes.c: @REBUILD@ $(gdk_public_h_sources) $(srcdir)/makeenums.pl
|
|
cd $(srcdir) \
|
|
&& $(PERL) ./makeenums.pl cfile $(gdk_public_h_sources) > gdkenumtypes.c
|
|
|
|
gdkconfig.h: stamp-gc-h
|
|
@if test -f gdkconfig.h; then :; \
|
|
else rm -f stamp-gc-h; $(MAKE) stamp-gc-h; fi
|
|
stamp-gc-h: ../config.status
|
|
cd .. && CONFIG_FILES= CONFIG_HEADERS= CONFIG_OTHER=gdk/gdkconfig.h ./config.status
|
|
echo timestamp > stamp-gc-h
|
|
|
|
.PHONY: files
|
|
|
|
files:
|
|
@files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
|
|
echo $$p; \
|
|
done
|