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 5aaf649b180ad5428a9fb49695b589cf88bf8f62..3a019a9a1565bcd4df3afd5a96abbbc33497d1c6 100644 (file)
--- a/gdk/linux-fb/Makefile.am
+++ b/gdk/linux-fb/Makefile.am
@@ -1,28 +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
+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   \
-       @FREETYPE_CFLAGS@       \
-       @GTK_DEBUG_FLAGS@       \
-       @GTK_XIM_FLAGS@         \
-       @GTK_LOCALE_FLAGS@      \
-       @GLIB_CFLAGS@           \
-       @PANGO_CFLAGS@          \
-@STRIP_END@
-
-LDFLAGS = @STRIP_BEGIN@ \
-       @GLIB_LIBS@     \
-       @PANGO_LIBS@    \
-       @FREETYPE_LIBS@ \
-       -lm             \
-@STRIP_END@
+       -DGDK_PIXBUF_DISABLE_DEPRECATED \
+       $(GDK_DEP_CFLAGS)       \
+       $(GTK_DEBUG_FLAGS)
 
 noinst_LTLIBRARIES = libgdk-linux-fb.la
 
@@ -32,8 +28,11 @@ libgdkinclude_HEADERS= \
 libgdk_linux_fb_la_SOURCES =    \
        gdkcolor-fb.c           \
        gdkcursor-fb.c          \
+       gdkdisplay-fb.c         \
        gdkdnd-fb.c             \
        gdkdrawable-fb2.c       \
+       gdkevents-fb.c          \
+       gdkfbmanager.h          \
        gdkfont-fb.c            \
        gdkgc-fb.c              \
        gdkgeometry-fb.c        \
@@ -41,18 +40,20 @@ libgdk_linux_fb_la_SOURCES =    \
        gdkim-fb.c              \
        gdkimage-fb.c           \
        gdkinput.c              \
+       gdkinputprivate.h       \
+       gdkkeyboard-fb.c        \
        gdkmain-fb.c            \
+       gdkmouse-fb.c           \
+       gdkpango-fb.c           \
        gdkpixmap-fb.c          \
+       gdkprivate-fb.h         \
        gdkproperty-fb.c        \
+       gdkrender-fb.c          \
+       gdkscreen-fb.c          \
        gdkselection-fb.c       \
+       gdkspawn-fb.c           \
        gdkvisual-fb.c          \
        gdkwindow-fb.c          \
-       gdkprivate-fb.h         \
-       gdkinputprivate.h       \
-       gdkkeyboard-fb.c        \
-       gdkmouse-fb.c           \
-       gdkevents-fb.c          \
-       gdkrender-fb.c          \
        mi.h                    \
        miarc.c                 \
        midash.c                \
@@ -66,15 +67,18 @@ libgdk_linux_fb_la_SOURCES =    \
        mipolygen.c             \
        mipolyutil.c            \
        miscanfill.h            \
+       mispans.c               \
        mispans.h               \
        mistruct.h              \
        mitypes.h               \
        miwideline.c            \
        miwideline.h            \
        mizerclip.c             \
-       mizerline.c             \
-       mispans.c               \
-       gdkpango-fb.c
-       mispans.c
+       mizerline.c
+
+gdkfbmanager_sources = gdkfbmanager.c 
+gdkfbmanager_LDFLAGS = $(GLIB_LIBS)
+gdkfbswitch_sources = gdkfbswitch.c
+gdkfbswitch_LDFLAGS = $(GLIB_LIBS)
 
-EXTRA_DIST=x-cursors.xbm
+EXTRA_DIST += x-cursors.xbm