call g_test_init() from gtk_test_init().

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

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 67ea241ed3ccdc64edcd78421a7bfa5cdaa7c62d..79e2327320d5e115599b0442d0eba5b7967bd018 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1,6 +1,7 @@
 # Makefile.am for gtk+/gtk
+include $(top_srcdir)/Makefile.decl
 
-SUBDIRS=theme-bits
+SUBDIRS = theme-bits . tests
 
 if OS_UNIX
 SUBDIRS += xdgmime
@@ -279,6 +280,7 @@ gtk_public_h_sources =          \
        gtkstyle.h              \
        gtktable.h              \
        gtktearoffmenuitem.h    \
+       gtktestutils.h          \
        gtktext.h               \
        gtktextbuffer.h         \
        gtktextbufferrichtext.h \
@@ -559,6 +561,7 @@ gtk_base_c_sources =            \
        gtkstyle.c              \
        gtktable.c              \
        gtktearoffmenuitem.c    \
+       gtktestutils.c          \
        gtktext.c               \
        gtktextbtree.c          \
        gtktextbuffer.c         \
@@ -714,6 +717,7 @@ gtk_built_private_headers =                 \
 gtk_built_sources =                            \
        gtkaliasdef.c                           \
        gtktypebuiltins.c                       \
+       gtktypefuncs.c                          \
        gtkmarshalers.c                         \
        gtkmarshal.c                            \
        ${gtk_built_private_headers}            \
@@ -743,7 +747,7 @@ gtk_extra_sources =                         \
 #
 MAINTAINERCLEANFILES = $(gtk_built_sources) $(stamp_files) $(GENERATED_ICONS)
 EXTRA_HEADERS =
-EXTRA_DIST = $(gtk_private_h_sources) $(gtk_extra_sources)
+EXTRA_DIST += $(gtk_private_h_sources) $(gtk_extra_sources)
 EXTRA_DIST += $(gtk_built_sources)
 EXTRA_DIST += $(STOCK_ICONS)
 
@@ -751,7 +755,7 @@ EXTRA_DIST += $(STOCK_ICONS)
 # rules to generate built sources
 #
 # setup autogeneration dependencies
-gen_sources = xgen-gdef xgen-gtbh xgen-gtic xgen-gmh xgen-gmc xgen-gmlh xgen-gmlc
+gen_sources = xgen-gdef xgen-gtbh xgen-gtic xgen-gmh xgen-gmc xgen-gmlh xgen-gmlc xgen-gtfsrc.c xgen-gtf
 CLEANFILES = $(gen_sources)
 
 BUILT_SOURCES = $(gtk_built_sources)
@@ -817,6 +821,14 @@ gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) Makefile
        && cp xgen-gtbc gtktypebuiltins.c  \
        && rm -f xgen-gtbc
 
+gtktypefuncs.c: @REBUILD@ $(top_srcdir)/gtk/*.h $(top_srcdir)/gdk/*.h Makefile
+       echo '#include <gtk/gtk.h>' > xgen-gtfsrc.c && \
+         ${CPP} $(DEFS) $(INCLUDES) -DGTK_ENABLE_BROKEN $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \
+         egrep -o '\<g[td]k_[a-zA-Z0-9_]+_get_type\>' | sort | uniq | \
+         sed '{ s/^/vgt=/; s/$$/();/; }' > xgen-gtf \
+       && cp xgen-gtf $@ && rm -f xgen-gtf
+gtktestutils.c: gtktypefuncs.c
+
 # target platform:
 lib_LTLIBRARIES = $(gtktargetlib)
 
@@ -834,13 +846,13 @@ libgtk_directfb_2_0_la_SOURCES = $(gtk_c_sources)
 
 libgtk_x11_2_0_la_LDFLAGS = $(libtool_opts)
 libgtk_linux_fb_2_0_la_LDFLAGS = $(libtool_opts)
-libgtk_win32_2_0_la_LDFLAGS = $(libtool_opts)
+libgtk_win32_2_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid
 libgtk_quartz_2_0_la_LDFLAGS = $(libtool_opts)
 libgtk_directfb_2_0_la_LDFLAGS = $(libtool_opts)
 
 libgtk_x11_2_0_la_LIBADD = $(libadd)
 libgtk_linux_fb_2_0_la_LIBADD = $(libadd)
-libgtk_win32_2_0_la_LIBADD = $(libadd) -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32 -luuid
+libgtk_win32_2_0_la_LIBADD = $(libadd) -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
 libgtk_win32_2_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32_res)
 libgtk_quartz_2_0_la_LIBADD = $(libadd)
 libgtk_directfb_2_0_la_LIBADD = $(libadd)
@@ -911,6 +923,7 @@ files:
        done
 
 STOCK_ICONS = \
+       stock-icons/16/document-open-recent.png         \
        stock-icons/16/gtk-about.png                    \
        stock-icons/16/gtk-add.png                      \
        stock-icons/16/gtk-cdrom.png                    \
@@ -1005,6 +1018,7 @@ STOCK_ICONS = \
        stock-icons/20/gtk-no.png                       \
        stock-icons/20/gtk-ok.png                       \
        stock-icons/20/gtk-yes.png                      \
+       stock-icons/24/document-open-recent.png         \
        stock-icons/24/gtk-about.png                    \
        stock-icons/24/gtk-add.png                      \
        stock-icons/24/gtk-bold.png                     \
@@ -1186,6 +1200,7 @@ EXTRA_DIST +=                   \
        tree_minus.xpm          \
        tree_plus.xpm           \
        gtk.def                 \
+       gtk-builder-convert     \
        gtk-win32.rc            \
        gtk-win32.rc.in         \
        gtkwin32embed.h         \
@@ -1195,6 +1210,7 @@ EXTRA_DIST +=                   \
        gtkfilesystemwin32.c    \
        gtkprint-win32.h        \
        gtkprint-win32.c        \
+       gtksearchenginequartz.h \
        gtkrc.default           \
        gtkrc.key.default       \
        gtkrc.key.emacs         \