forked from AuroraMiddleware/gtk
aeaaae04ac
Wed Jun 5 18:34:47 2002 Owen Taylor <otaylor@redhat.com> Changes multihead reorganizing code for win32 support, mostly from a patch by Hans Breuer. * gdk/gdkcolor.c gdk/x11/gdkcolor-x11.c gdk/gdkcursor.c gdk/x11/gdkcursor-x11.c gdk/gdkevents.c gdk/x11/gdkevents-x11.c gdk/gdkfont.c gdk/x11/gdkfont-x11.c gdk/gdkkeys.c gdk/x11/gdkkeys-x11.c gdk/gdkimage.c gdk/x11/gdkimage-x11.c gdk/gdkscreen.c gdk/x11/gdkmain-x11.c gdk/gdkdisplay.c gdk/gdkevents-x11.c gdk/gdkpango.c gdk/x11/gdkpango-x11.c gdk/gdkselection.c gdk/x11/gdkselection-x11.c gdk/gdkwindow.c gdk/x11/gdkwindow-x11.c gdk/gdkvisual.c gdk/x11/gdkvisual-x11.c: Move port-independent singlehead wrapper functions into port-independent part of GDK. (#80009) * gdk/win32/gdkcolor-win32.c gdk/win32/gdkcursor-win32.c gdk/win32/gdkevents-win32.c gdk/win32/gdkfont-win32.c gdk/win32/gdkimage-win32.c gdk/win32/gdkkeys-win32.c gdk/win32/gdkmain-win32.c gdk/win32/gdkproperty-win32.c gdk/win32/gdkselection-win32.c gdk/win32/gkwindow-win32.c: Turn singlehead functions into "multihead" functions that ignore their GdkDisplay or GdkScreen arguments. * gdk/win32/gdkdrawable-win32.c gdk/win32/gdkevents-win32.c gdk/win32/gdkinput-win32.c gdk/win32/gdkprivate-win32.h: Misc multihead-compatibility changes. * gtk/gtk.def gdk/gdk.def: Update for multihead functions. * gdk/gdkcolormap.h gdk/gdkvisual.h gdk/x11/gdkcolormap-x11.c gdk/x11/gdkvisual-x11.c: Remove the screen fields from the public parts of the colormap/visual structures, add accessors instead. * gdk/gdkpixbuf-render.c gdk/gdkpixmap.c gdk/gdkrgb.c gdk/x11/gdkcolormap-x11.c gdk/x11/gdkimage-x11.c gdk/x11/gdkimage-x11.c gdk/x11/gdkprivate-x11.h gtk/gtkgc.c gtk/gtkstyle.c gtk/gtkwidget.c: Use accessors to get the screen for colormaps, visuals; move the fields into the private structures for the x11 backend. * gdk/gdkdisplay.[ch] gdk/x11/gdkdisplay-x11.[ch] gdk/gdkscreen.[ch] gdk/x11/gdkscreen-x11.c: Remove virtualization of screen and display functions. (#79990, patch from Erwann Chenede) * gdk/win32/gdkdisplay-x11.c gdk/win32/gdkscreen-win32.c gdk/win32/{Makefile.am, makefile.msc, makefile.mingw}: New files containing stub implementations of Display, Screen functions. * gdk/x11/gdkscreen-x11.[ch] gdk/x11/gdkdisplay-x11.[ch] gdk/x11/gdkx.h: Clean up function exports and what headers they are in. (#79954) * gdk/x11/gdkx.h: Fix macro that was referring to a non-existant screen->screen_num. (In the patch for #79972, Erwann Chenede) * gdk/gdkscreen.c gdk/gdkwindow.c gdk/x11/gdkinternals.h gdk/x11/gdkscreen-x11.c: Fix gdk_screen_get_window_at_pointer() to use window hooks. (#79972, patch partly from Erwann Chenede) * gdk/x11/gdkdisplay-x11.c gdk/x11/gdkevents-x11.c: Fix some warnings.
239 lines
6.3 KiB
Makefile
239 lines
6.3 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@ \
|
|
-DGDK_COMPILATION \
|
|
@STRIP_END@
|
|
|
|
INCLUDES = $(common_includes)
|
|
gtarget=@gdktarget@
|
|
|
|
if PLATFORM_WIN32
|
|
no_undefined = -no-undefined
|
|
|
|
if HAVE_WINTAB
|
|
wintab_lib = -Lwin32 -lwntab32x
|
|
endif
|
|
|
|
if HAVE_IE55
|
|
ie55uuid_lib = -Lwin32 -lie55uuid
|
|
endif
|
|
endif
|
|
|
|
if OS_WIN32
|
|
gdk_win32_symbols = -export-symbols gdk.def
|
|
|
|
install-libtool-import-lib:
|
|
$(INSTALL) .libs/libgdk-win32-$(GTK_API_VERSION).dll.a $(DESTDIR)$(libdir)
|
|
uninstall-libtool-import-lib:
|
|
-rm $(DESTDIR)$(libdir)/libgdk-win32-$(GTK_API_VERSION).dll.a
|
|
else
|
|
install-libtool-import-lib:
|
|
uninstall-libtool-import-lib:
|
|
endif
|
|
|
|
if MS_LIB_AVAILABLE
|
|
noinst_DATA = gdk-win32-$(GTK_API_VERSION).lib
|
|
|
|
gdk-win32-$(GTK_API_VERSION).lib: libgdk-win32-$(GTK_API_VERSION).la gdk.def
|
|
lib -name:libgdk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gdk.def -out:$@
|
|
|
|
install-ms-lib:
|
|
$(INSTALL) gdk-win32-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir)
|
|
|
|
uninstall-ms-lib:
|
|
-rm $(DESTDIR)$(libdir)/gdk-win32-$(GTK_API_VERSION).lib
|
|
else
|
|
install-ms-lib:
|
|
uninstall-ms-lib:
|
|
endif
|
|
|
|
# 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 $(libdir) \
|
|
$(no_undefined) \
|
|
@LIBTOOL_EXPORT_OPTIONS@ \
|
|
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
|
|
$(gdk_win32_symbols) \
|
|
@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 \
|
|
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 \
|
|
gdkdisplay.h \
|
|
gdkscreen.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 \
|
|
gdkselection.c \
|
|
gdkvisual.c \
|
|
gdkwindow.c \
|
|
gdkdisplay.c \
|
|
gdkscreen.c \
|
|
@STRIP_END@
|
|
|
|
#
|
|
# setup GDK sources and their dependancies
|
|
#
|
|
|
|
gdkincludedir = $(includedir)/gtk-2.0/gdk
|
|
gdkinclude_HEADERS = $(gdk_headers)
|
|
|
|
libgdk_x11_2_0_la_SOURCES = $(gdk_c_sources) gdkenumtypes.c
|
|
libgdk_linux_fb_2_0_la_SOURCES = $(gdk_c_sources) gdkenumtypes.c
|
|
libgdk_win32_2_0_la_SOURCES = $(gdk_c_sources) gdkenumtypes.c
|
|
|
|
libgdk_x11_2_0_la_LIBADD = x11/libgdk-x11.la
|
|
libgdk_linux_fb_2_0_la_LIBADD = linux-fb/libgdk-linux-fb.la
|
|
libgdk_win32_2_0_la_LIBADD = \
|
|
win32/libgdk-win32.la $(wintab_lib) $(ie55uuid_lib)
|
|
|
|
lib_LTLIBRARIES = $(gdktargetlib)
|
|
|
|
EXTRA_LTLIBRARIES = libgdk-x11-2.0.la libgdk-linux-fb-2.0.la libgdk-win32-2.0.la
|
|
|
|
MAINTAINERCLEANFILES = gdkenumtypes.h stamp-gdkenumtypes.h
|
|
EXTRA_HEADERS =
|
|
|
|
#
|
|
# 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
|
|
|
|
install-exec-hook:
|
|
if DISABLE_EXPLICIT_DEPS
|
|
$(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/$(gdktargetlib)
|
|
endif
|
|
|
|
#note: not gdkconfig.h
|
|
BUILT_SOURCES = stamp-gc-h @REBUILD@ gdkenumtypes.h
|
|
|
|
# Generate built header without using automake-1.4 BUILT_SOURCES
|
|
$(libgdk_x11_2_0_la_OBJECTS) $(libgdk_linux_fb_2_0_la_OBJECTS) $(libgdk_win32_2_0_la_OBJECTS): gdkenumtypes.h
|
|
|
|
$(srcdir)/gdkenumtypes.h: stamp-gdkenumtypes.h
|
|
@true
|
|
stamp-gdkenumtypes.h: @REBUILD@ $(gdk_public_h_sources) Makefile
|
|
( cd $(srcdir) && glib-mkenums \
|
|
--fhead "#ifndef __GDK_ENUM_TYPES_H__\n#define __GDK_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
|
|
--fprod "/* enumerations from \"@filename@\" */\n" \
|
|
--vhead "GType @enum_name@_get_type (void);\n#define GDK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
|
|
--ftail "G_END_DECLS\n\n#endif /* __GDK_ENUM_TYPES_H__ */" \
|
|
$(gdk_public_h_sources) ) >> xgen-geth \
|
|
&& (cmp -s xgen-geth $(srcdir)/gdkenumtypes.h || cp xgen-geth $(srcdir)/gdkenumtypes.h ) \
|
|
&& rm -f xgen-geth \
|
|
&& echo timestamp > $(@F)
|
|
$(srcdir)/gdkenumtypes.c: @REBUILD@ $(gdk_public_h_sources) Makefile
|
|
( cd $(srcdir) && glib-mkenums \
|
|
--fhead "#define GDK_ENABLE_BROKEN\n#include \"gdk.h\"" \
|
|
--fprod "\n/* enumerations from \"@filename@\" */" \
|
|
--vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \
|
|
--vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
|
|
--vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \
|
|
$(gdk_public_h_sources) ) > xgen-getc \
|
|
&& cp xgen-getc $(srcdir)/gdkenumtypes.c \
|
|
&& rm -f xgen-getc
|
|
|
|
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
|
|
|
|
install-data-local: install-ms-lib install-libtool-import-lib
|
|
|
|
uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
|
|
|
|
.PHONY: files
|
|
|
|
files:
|
|
@files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
|
|
echo $$p; \
|
|
done
|