EXTRA_DIST = \
gdkconfig.h.win32 \
gdk.def \
- makefile.mingw \
- makefile.mingw.in \
+ gdkmarshalers.list \
makeenums.pl \
makefile.msc
common_includes = @STRIP_BEGIN@ \
-DG_LOG_DOMAIN=\"Gdk\" \
+ -DGDK_COMPILATION \
-I$(top_srcdir) \
-I$(top_builddir)/gdk \
-I$(top_srcdir)/gdk-pixbuf \
+ -DG_DISABLE_DEPRECATED \
+ -DGDK_PIXBUF_DISABLE_DEPRECATED \
+ -DGDK_DISABLE_DEPRECATED \
@GTK_DEBUG_FLAGS@ \
@GDK_DEP_CFLAGS@ \
- -DGDK_COMPILATION \
@STRIP_END@
INCLUDES = $(common_includes)
# since automake doesn't support conditionalized libsomething_la_LDFLAGS
# we use the general approach here
LDFLAGS = @STRIP_BEGIN@ \
+ @LDFLAGS@ \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-export-dynamic \
-rpath $(libdir) \
@LIBTOOL_EXPORT_OPTIONS@ \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(gdk_win32_symbols) \
- @GDK_DEP_LIBS@ \
@STRIP_END@
#
#
# 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 \
+gdk_public_h_sources = @STRIP_BEGIN@ \
+ gdk.h \
+ gdkcolor.h \
+ gdkcursor.h \
+ gdkdisplay.h \
+ gdkdnd.h \
+ gdkdrawable.h \
+ gdkevents.h \
+ gdkfont.h \
+ gdkgc.h \
+ gdkkeysyms.h \
+ gdki18n.h \
+ gdkimage.h \
+ gdkinput.h \
+ gdkkeys.h \
+ gdkdisplaymanager.h \
+ gdkpango.h \
+ gdkpixbuf.h \
+ gdkpixmap.h \
+ gdkproperty.h \
+ gdkregion.h \
+ gdkrgb.h \
+ gdkscreen.h \
+ gdkselection.h \
+ gdktypes.h \
+ gdkvisual.h \
+ gdkwindow.h \
@STRIP_END@
gdk_headers = @STRIP_BEGIN@ \
gdk.c \
gdkcolor.c \
gdkcursor.c \
+ gdkdisplay.c \
+ gdkdnd.c \
gdkdraw.c \
gdkevents.c \
gdkfont.c \
gdkkeyuni.c \
gdkimage.c \
gdkinternals.h \
+ gdkintl.h \
+ gdkdisplaymanager.c \
gdkpango.c \
gdkpixbuf-drawable.c \
gdkpixbuf-render.c \
gdkrectangle.c \
gdkregion-generic.c \
gdkregion-generic.h \
+ gdkscreen.c \
gdkselection.c \
gdkvisual.c \
gdkwindow.c \
- gdkdisplay.c \
- gdkscreen.c \
@STRIP_END@
#
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
+# gdkmarshalers.c is not here becuase it is currently an empty file
+common_sources = @STRIP_BEGIN@ \
+ $(gdk_c_sources) \
+ gdkenumtypes.c \
+ gdkmarshalers.h \
+@STRIP_END@
+
+libgdk_x11_2_0_la_SOURCES = $(common_sources)
+libgdk_linux_fb_2_0_la_SOURCES = $(common_sources) gdkkeynames.c
+libgdk_win32_2_0_la_SOURCES = $(common_sources) gdkkeynames.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_x11_2_0_la_LIBADD = x11/libgdk-x11.la @GDK_DEP_LIBS@
+libgdk_linux_fb_2_0_la_LIBADD = linux-fb/libgdk-linux-fb.la @GDK_DEP_LIBS@
libgdk_win32_2_0_la_LIBADD = \
- win32/libgdk-win32.la $(wintab_lib) $(ie55uuid_lib)
+ win32/libgdk-win32.la $(wintab_lib) $(ie55uuid_lib) \
+ @GDK_DEP_LIBS@
lib_LTLIBRARIES = $(gdktargetlib)
endif
#note: not gdkconfig.h
-BUILT_SOURCES = stamp-gc-h @REBUILD@ gdkenumtypes.h
+BUILT_SOURCES = stamp-gc-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
+$(libgdk_x11_2_0_la_OBJECTS) $(libgdk_linux_fb_2_0_la_OBJECTS) $(libgdk_win32_2_0_la_OBJECTS): gdkenumtypes.h gdkmarshalers.h
$(srcdir)/gdkenumtypes.h: stamp-gdkenumtypes.h
@true
$(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@\" */" \
+ --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" \
&& cp xgen-getc $(srcdir)/gdkenumtypes.c \
&& rm -f xgen-getc
+#
+# Marshaller generation
+#
+$(srcdir)/gdkmarshalers.h: @REBUILD@ gdkmarshalers.list
+ cd $(srcdir) && \
+ ( @GLIB_GENMARSHAL@ --prefix=gdk_marshal gdkmarshalers.list --header > gdkmarshalers.tmp \
+ && mv gdkmarshalers.tmp gdkmarshalers.h ) \
+ || ( rm -f gdkmarshalers.tmp && exit 1 )
+$(srcdir)/gdkmarshalers.c: @REBUILD@ gdkmarshalers.list
+ cd $(srcdir) && \
+ $( @GLIB_GENMARSHAL@ --prefix=gdk_marshal gdkmarshalers.list --body > gdkmarshalers.tmp \
+ && mv gdkmarshalers.tmp gdkmarshalers.c ) \
+ || ( rm -f gdkmarshalers.tmp && exit 1 )
+
gdkconfig.h: stamp-gc-h
@if test -f gdkconfig.h; then :; \
else rm -f stamp-gc-h; $(MAKE) stamp-gc-h; fi
projects / ~andy / gtk / blobdiff