call g_test_init() from gtk_test_init().

[~andy/gtk] / gdk / linux-fb / Makefile.am

diff --git a/gdk/linux-fb/Makefile.am b/gdk/linux-fb/Makefile.am
index 8b6639d62c4c305fb6804ab1a7be8e8336e3ff05..3a019a9a1565bcd4df3afd5a96abbbc33497d1c6 100644 (file)
--- a/gdk/linux-fb/Makefile.am
+++ b/gdk/linux-fb/Makefile.am
@@ -1,25 +1,24 @@
 ## Process this file with automake to produce Makefile.in
+include $(top_srcdir)/Makefile.decl
+
+bin_PROGRAMS =
 
 if ENABLE_FB_MANAGER
-bin_PROGRAMS = gdkfbmanager gdkfbswitch
-else
-bin_PROGRAMS = 
+bin_PROGRAMS += gdkfbmanager gdkfbswitch
 endif
 
 libgdkincludedir = $(includedir)/gtk-2.0/gdk
 libgdkfbincludedir = $(includedir)/gtk-2.0/gdk/linux-fb
 
-INCLUDES = @STRIP_BEGIN@       \
+INCLUDES = \
        -DG_LOG_DOMAIN=\"Gdk\"  \
        -DGDK_DATA_PREFIX=\"$(prefix)\" \
        -I$(top_srcdir)         \
        -I$(top_srcdir)/gdk     \
        -I$(top_builddir)/gdk   \
-       -DG_DISABLE_DEPRECATED  \
        -DGDK_PIXBUF_DISABLE_DEPRECATED \
-       @GDK_DEP_CFLAGS@        \
-       @GTK_DEBUG_FLAGS@       \
-@STRIP_END@
+       $(GDK_DEP_CFLAGS)       \
+       $(GTK_DEBUG_FLAGS)
 
 noinst_LTLIBRARIES = libgdk-linux-fb.la
 
@@ -52,6 +51,7 @@ libgdk_linux_fb_la_SOURCES =    \
        gdkrender-fb.c          \
        gdkscreen-fb.c          \
        gdkselection-fb.c       \
+       gdkspawn-fb.c           \
        gdkvisual-fb.c          \
        gdkwindow-fb.c          \
        mi.h                    \
@@ -81,4 +81,4 @@ gdkfbmanager_LDFLAGS = $(GLIB_LIBS)
 gdkfbswitch_sources = gdkfbswitch.c
 gdkfbswitch_LDFLAGS = $(GLIB_LIBS)
 
-EXTRA_DIST=x-cursors.xbm
+EXTRA_DIST += x-cursors.xbm