Use templates for glib-mkenums calls instead of complicated commandlines

[~andy/gtk] / gdk / Makefile.am

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 6db73bd08449309ebd4d764f7e375772397df80b..aeba1389ceebbca55324306d7d17a6e163eb294f 100644 (file)
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -1,21 +1,27 @@
 ## Makefile.am for gtk+/gdk
+include $(top_srcdir)/Makefile.decl
 
 SUBDIRS = $(gdktarget)
-DIST_SUBDIRS = linux-fb win32 x11
+DIST_SUBDIRS = win32 x11 quartz directfb
 
-EXTRA_DIST =                   \
+EXTRA_DIST +=                  \
        keynames.txt            \
        keyname-table.h         \
        gen-keyname-table.pl    \
        gdkconfig.h.win32       \
+       gdkkeysyms-update.pl    \
        gdk.def                 \
        gdkmarshalers.list      \
+       gdkmedialib.h           \
        makeenums.pl            \
        makefile.msc            \
        gdk.symbols             \
        makegdkalias.pl         \
        gdkaliasdef.c           \
-       abicheck.sh
+       gdkenumtypes.c.template \
+       gdkenumtypes.h.template \
+       abicheck.sh             \
+       pltcheck.sh
 
 INCLUDES =                              \
        -DG_LOG_DOMAIN=\"Gdk\"          \
@@ -23,9 +29,7 @@ INCLUDES =                              \
        -I$(top_srcdir)                 \
        -I$(top_builddir)/gdk           \
        -I$(top_srcdir)/gdk-pixbuf      \
-       -DG_DISABLE_DEPRECATED          \
-       -DGDK_PIXBUF_DISABLE_DEPRECATED \
-       -DGDK_DISABLE_DEPRECATED        \
+       -DGDK_PIXBUF_DISABLE_DEPRECATED \
        $(GTK_DEBUG_FLAGS)              \
        $(GDK_DEP_CFLAGS)
 
@@ -45,6 +49,12 @@ LDADD = \
        $(no_undefined)                                                 \
        $(LIBTOOL_EXPORT_OPTIONS)
 
+if USE_MEDIALIB
+medialib_sources =  \
+    gdkmedialib.c
+else
+medialib_sources =
+endif
 
 #
 # setup source file variables
@@ -78,6 +88,7 @@ gdk_public_h_sources =                                \
        gdkscreen.h                             \
        gdkselection.h                          \
        gdkspawn.h                              \
+       gdktestutils.h                          \
        gdktypes.h                              \
        gdkvisual.h                             \
        gdkwindow.h
@@ -89,6 +100,7 @@ gdk_headers =                     \
        gdkalias.h
 
 gdk_c_sources =                 \
+       $(medialib_sources)     \
        gdk.c                   \
        gdkcairo.c              \
        gdkcolor.c              \
@@ -134,27 +146,26 @@ common_sources =                \
        gdkenumtypes.c          \
        gdkmarshalers.h
 
+libgdk_directfb_2_0_la_SOURCES = $(common_sources) 
+libgdk_directfb_2_0_la_LIBADD = directfb/libgdk-directfb.la $(GDK_DEP_LIBS) \
+  $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
+libgdk_directfb_2_0_la_LDFLAGS = $(LDADD)
+
 libgdk_x11_2_0_la_SOURCES = $(common_sources)
 libgdk_x11_2_0_la_LIBADD = x11/libgdk-x11.la $(GDK_DEP_LIBS) \
   $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
 libgdk_x11_2_0_la_LDFLAGS = $(LDADD)
 
-libgdk_linux_fb_2_0_la_SOURCES = $(common_sources) gdkkeynames.c
-libgdk_linux_fb_2_0_la_LIBADD = linux-fb/libgdk-linux-fb.la $(GDK_DEP_LIBS) \
+libgdk_quartz_2_0_la_SOURCES = $(common_sources) gdkkeynames.c
+libgdk_quartz_2_0_la_LIBADD = quartz/libgdk-quartz.la $(GDK_DEP_LIBS) \
   $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
-libgdk_linux_fb_2_0_la_LDFLAGS = $(LDADD)
+libgdk_quartz_2_0_la_LDFLAGS = $(LDADD)
 
 libgdk_win32_2_0_la_SOURCES = $(common_sources) gdkkeynames.c
 libgdk_win32_2_0_la_LIBADD = win32/libgdk-win32.la $(GDK_DEP_LIBS) \
   $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
 libgdk_win32_2_0_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o gdk.def
 libgdk_win32_2_0_la_LDFLAGS = -Wl,win32/rc/gdk-win32-res.o -export-symbols gdk.def $(LDADD)
-if HAVE_WINTAB
-libgdk_win32_2_0_la_LIBADD += -Lwin32 -lwntab32x
-endif
-if HAVE_IE55
-libgdk_win32_2_0_la_LIBADD += -Lwin32 -lie55uuid
-endif
 
 if OS_WIN32
 install-def-file: gdk.def
@@ -192,13 +203,13 @@ gdkaliasdef.c: gdk.symbols
         $(PERL) $(srcdir)/makegdkalias.pl -def < $(srcdir)/gdk.symbols > gdkaliasdef.c
 
 if OS_LINUX
-TESTS = abicheck.sh
+TESTS = abicheck.sh pltcheck.sh
 endif
 
 
 lib_LTLIBRARIES = $(gdktargetlib)
 
-EXTRA_LTLIBRARIES = libgdk-x11-2.0.la libgdk-linux-fb-2.0.la libgdk-win32-2.0.la
+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
@@ -233,24 +244,14 @@ BUILT_SOURCES =                                   \
 
 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) G_GNUC_CONST;\n#define GDK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
-                       --ftail "G_END_DECLS\n\n#endif /* __GDK_ENUM_TYPES_H__ */" \
+stamp-gdkenumtypes.h: @REBUILD@ $(gdk_public_h_sources) gdkenumtypes.h.template
+       ( cd $(srcdir) && $(GLIB_MKENUMS) --template gdkenumtypes.h.template \
                $(gdk_public_h_sources) ) >> xgen-geth \
        && (cmp -s xgen-geth gdkenumtypes.h || cp xgen-geth gdkenumtypes.h ) \
        && rm -f xgen-geth \
        && echo timestamp > $(@F)
-gdkenumtypes.c: @REBUILD@ $(gdk_public_h_sources) Makefile
-       ( cd $(srcdir) && glib-mkenums \
-                       --fhead "#define GDK_ENABLE_BROKEN\n#include \"gdk.h\"\n#include \"gdkalias.h\"\n" \
-                       --fprod "\n/* enumerations from \"@filename@\" */" \
-                       --ftail "\n#define __GDK_ENUM_TYPES_C__\n#include \"gdkaliasdef.c\"\n" \
-                       --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 (g_intern_static_string (\"@EnumName@\"), values);\n  }\n  return etype;\n}\n" \
+gdkenumtypes.c: @REBUILD@ $(gdk_public_h_sources) gdkenumtypes.c.template
+       ( cd $(srcdir) && $(GLIB_MKENUMS) --template gdkenumtypes.c.template \
                $(gdk_public_h_sources) ) > xgen-getc \
        && cp xgen-getc gdkenumtypes.c  \
        && rm -f xgen-getc