Make GTK+ use an external gdk-pixbuf

[~andy/gtk] / modules / other / gail / Makefile.am

diff --git a/modules/other/gail/Makefile.am b/modules/other/gail/Makefile.am
index 56f27d34c79fe30a6765b838b320fb8085169db8..4745347ef7565d13e8a6517da304b6cba31adce4 100644 (file)
--- a/modules/other/gail/Makefile.am
+++ b/modules/other/gail/Makefile.am
@@ -1,12 +1,12 @@
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS = libgail-util
+SUBDIRS = libgail-util tests
 
-if OS_WIN32
+if PLATFORM_WIN32
 no_undefined = -no-undefined
 endif
 
-moduledir = $(libdir)/gtk-2.0/modules
+moduledir = $(libdir)/gtk-3.0/modules
 module_LTLIBRARIES = libgail.la
 
 gail_c_sources =                       \
@@ -15,7 +15,6 @@ gail_c_sources =                      \
        gailadjustment.c                \
        gailarrow.c                     \
        gailbooleancell.c               \
-       gailbooleancellfactory.c        \
        gailbox.c                       \
        gailbutton.c                    \
        gailcalendar.c                  \
@@ -23,9 +22,6 @@ gail_c_sources =                      \
        gailcellparent.c                \
        gailcheckmenuitem.c             \
        gailchecksubmenuitem.c          \
-       gailclist.c                     \
-       gailclistcell.c                 \
-       gailcombo.c                     \
        gailcombobox.c                  \
        gailcontainer.c                 \
        gailcontainercell.c             \
@@ -34,28 +30,23 @@ gail_c_sources =                    \
        gailframe.c                     \
        gailimage.c                     \
        gailimagecell.c                 \
-       gailimagecellfactory.c          \
        gailitem.c                      \
        gaillabel.c                     \
-       gaillist.c                      \
        gailmenu.c                      \
        gailmenushell.c                 \
        gailmenuitem.c                  \
        gailnotebook.c                  \
        gailnotebookpage.c              \
        gailobject.c                    \
-       gailobjectfactory.c             \
-       gailoptionmenu.c                \
        gailpaned.c                     \
-       gailpixmap.c                    \
        gailprogressbar.c               \
        gailradiobutton.c               \
        gailradiomenuitem.c             \
        gailradiosubmenuitem.c          \
        gailrange.c                     \
        gailrenderercell.c              \
-       gailrenderercellfactory.c       \
        gailscale.c                     \
+       gailscalebutton.c               \
        gailscrollbar.c                 \
        gailscrolledwindow.c            \
        gailseparator.c                 \
@@ -63,7 +54,6 @@ gail_c_sources =                      \
        gailsubmenuitem.c               \
        gailstatusbar.c                 \
        gailtextcell.c                  \
-       gailtextcellfactory.c           \
        gailtextview.c                  \
        gailtogglebutton.c              \
        gailtoplevel.c                  \
@@ -72,14 +62,13 @@ gail_c_sources =                    \
        gailwidget.c                    \
        gailwindow.c
 
-libgailincludedir=$(includedir)/gail-1.0/gail
+libgailincludedir=$(includedir)/gail-3.0/gail
 
 gail_private_h_sources =               \
        gail.h                          \
        gailadjustment.h                \
        gailarrow.h                     \
        gailbooleancell.h               \
-       gailbooleancellfactory.h        \
        gailbox.h                       \
        gailbutton.h                    \
        gailcalendar.h                  \
@@ -87,9 +76,6 @@ gail_private_h_sources =              \
        gailcellparent.h                \
        gailcheckmenuitem.h             \
        gailchecksubmenuitem.h          \
-       gailclist.h                     \
-       gailclistcell.h                 \
-       gailcombo.h                     \
        gailcombobox.h                  \
        gailcontainercell.h             \
        gailcontainer.h                 \
@@ -99,28 +85,23 @@ gail_private_h_sources =            \
        gailframe.h                     \
        gailimage.h                     \
        gailimagecell.h                 \
-       gailimagecellfactory.h          \
        gailitem.h                      \
        gaillabel.h                     \
-       gaillist.h                      \
        gailmenu.h                      \
        gailmenushell.h                 \
        gailmenuitem.h                  \
        gailnotebook.h                  \
        gailnotebookpage.h              \
        gailobject.h                    \
-       gailobjectfactory.h             \
-       gailoptionmenu.h                \
        gailpaned.h                     \
-       gailpixmap.h                    \
        gailprogressbar.h               \
        gailradiobutton.h               \
        gailradiomenuitem.h             \
        gailradiosubmenuitem.h          \
        gailrange.h                     \
        gailrenderercell.h              \
-       gailrenderercellfactory.h       \
        gailscale.h                     \
+       gailscalebutton.h               \
        gailscrollbar.h                 \
        gailscrolledwindow.h            \
        gailseparator.h                 \
@@ -128,7 +109,6 @@ gail_private_h_sources =            \
        gailsubmenuitem.h               \
        gailstatusbar.h                 \
        gailtextcell.h                  \
-       gailtextcellfactory.h           \
        gailtextview.h                  \
        gailtogglebutton.h              \
        gailtoplevel.h                  \
@@ -148,24 +128,26 @@ libgailinclude_HEADERS =          \
        $(gail_public_h_sources)
 
 libgail_la_CPPFLAGS = \
+       -I$(top_srcdir)                 \
        -I$(top_srcdir)/modules/other   \
-       -I$(top_srcdir)/gdk     \
-       -I$(top_builddir)/gdk   \
-       -I$(top_srcdir)/gtk     \
-       -I$(top_builddir)/gtk   \
-       -DGTK_VERSION=\"$(GTK_VERSION)\"        \
+       -I$(top_srcdir)/gdk             \
+       -I$(top_builddir)/gdk           \
+       -I$(top_srcdir)/gtk             \
+       -I$(top_builddir)/gtk           \
+       -DGTK_VERSION=\"$(GTK_VERSION)\"\
+       -DGDK_DISABLE_DEPRECATED        \
+       -DGTK_DISABLE_DEPRECATED        \
        $(AM_CPPFLAGS)
-       
+
 libgail_la_CFLAGS = \
        $(GTK_DEP_CFLAGS)       \
        $(GTK_DEBUG_FLAGS)      \
        $(AM_CFLAGS)
 
 libgail_la_LIBADD =  \
-       $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
        $(top_builddir)/gdk/$(gdktargetlib)                             \
        $(top_builddir)/gtk/$(gtktargetlib)                             \
-       $(top_builddir)/modules/other/gail/libgail-util/libgailutil.la  \
+       $(top_builddir)/modules/other/gail/libgail-util/libgailutil-3.0.la      \
        $(GTK_DEP_LIBS)                                                 \
        $(INTLLIBS)
 
@@ -173,3 +155,5 @@ libgail_la_LDFLAGS =    \
        -rpath $(moduledir) -module -avoid-version \
        $(no_undefined) \
         $(LDFLAGS)
+
+-include $(top_srcdir)/git.mk