]> Pileus Git - ~andy/gtk/blobdiff - gtk/Makefile.am
removed linux-fb backend files.
[~andy/gtk] / gtk / Makefile.am
index 79e2327320d5e115599b0442d0eba5b7967bd018..35ddd2db9cdc3af1ec67aa2591fa271adadfb9a1 100644 (file)
@@ -1,14 +1,19 @@
 # Makefile.am for gtk+/gtk
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS = theme-bits . tests
+xdgmimedir =
 
 if OS_UNIX
-SUBDIRS += xdgmime
+xdgmimedir += xdgmime
+if USE_QUARTZ
+GTK_PRINT_PREVIEW_COMMAND="/Applications/Preview.app/Contents/MacOS/Preview %f"
+else
 GTK_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings %s %f"
 endif
+endif
 
-DIST_SUBDIRS=theme-bits xdgmime
+SUBDIRS = theme-bits $(xdgmimedir) . tests
+DIST_SUBDIRS=theme-bits xdgmime tests
 
 if HAVE_CUPS
 GTK_PRINT_BACKENDS=file,cups
@@ -28,6 +33,7 @@ INCLUDES =                                            \
        -DGTK_COMPILATION                               \
        -DGTK_PRINT_BACKENDS=\"$(GTK_PRINT_BACKENDS)\"  \
        -DGTK_PRINT_PREVIEW_COMMAND=\"$(GTK_PRINT_PREVIEW_COMMAND)\"    \
+       -I$(top_builddir)                               \
        -I$(top_builddir)/gtk                           \
        -I$(top_srcdir) -I../gdk                        \
        -I$(top_srcdir)/gdk                             \
@@ -162,15 +168,12 @@ gtk_public_h_sources =          \
        gtkcheckbutton.h        \
        gtkcheckmenuitem.h      \
        gtkclipboard.h          \
-       gtkclist.h              \
        gtkcolorbutton.h        \
        gtkcolorsel.h           \
        gtkcolorseldialog.h     \
-       gtkcombo.h              \
        gtkcombobox.h           \
        gtkcomboboxentry.h      \
        gtkcontainer.h          \
-       gtkctree.h              \
        gtkcurve.h              \
        gtkdebug.h              \
        gtkdialog.h             \
@@ -187,7 +190,6 @@ gtk_public_h_sources =          \
        gtkfilechooserdialog.h  \
        gtkfilechooserwidget.h  \
        gtkfilefilter.h         \
-       gtkfilesel.h            \
        gtkfixed.h              \
        gtkfontbutton.h         \
        gtkfontsel.h            \
@@ -214,12 +216,9 @@ gtk_public_h_sources =          \
        gtkinputdialog.h        \
        gtkinvisible.h          \
        gtkitem.h               \
-       gtkitemfactory.h        \
        gtklabel.h              \
        gtklayout.h             \
        gtklinkbutton.h         \
-       gtklist.h               \
-       gtklistitem.h           \
        gtkliststore.h          \
        gtkmain.h               \
        gtkmenu.h               \
@@ -232,20 +231,15 @@ gtk_public_h_sources =          \
        gtkmodules.h            \
        gtknotebook.h           \
        gtkobject.h             \
-       gtkoldeditable.h        \
-       gtkoptionmenu.h         \
        gtkpagesetup.h          \
        gtkpaned.h              \
        gtkpapersize.h          \
-       gtkpixmap.h             \
        gtkplug.h               \
-       gtkpreview.h            \
        gtkprintcontext.h       \
        gtkprintoperation.h     \
        gtkprintoperationpreview.h      \
        gtkprintsettings.h      \
        gtkprivate.h            \
-       gtkprogress.h           \
        gtkprogressbar.h        \
        gtkradioaction.h        \
        gtkradiobutton.h        \
@@ -270,7 +264,6 @@ gtk_public_h_sources =          \
        gtkseparatormenuitem.h  \
        gtkseparatortoolitem.h  \
        gtksettings.h           \
-       gtksignal.h             \
        gtksizegroup.h          \
        gtksocket.h             \
        gtkspinbutton.h         \
@@ -281,7 +274,6 @@ gtk_public_h_sources =          \
        gtktable.h              \
        gtktearoffmenuitem.h    \
        gtktestutils.h          \
-       gtktext.h               \
        gtktextbuffer.h         \
        gtktextbufferrichtext.h \
        gtktextchild.h          \
@@ -291,18 +283,15 @@ gtk_public_h_sources =          \
        gtktexttag.h            \
        gtktexttagtable.h       \
        gtktextview.h           \
-       gtktipsquery.h          \
        gtktoggleaction.h       \
        gtktogglebutton.h       \
        gtktoggletoolbutton.h   \
        gtktoolbar.h            \
        gtktoolbutton.h         \
        gtktoolitem.h           \
+       gtktoolshell.h          \
        gtktooltip.h            \
-       gtktooltips.h           \
-       gtktree.h               \
        gtktreednd.h            \
-       gtktreeitem.h           \
        gtktreemodel.h          \
        gtktreemodelfilter.h    \
        gtktreemodelsort.h      \
@@ -428,15 +417,12 @@ gtk_base_c_sources =            \
        gtkcellview.c           \
        gtkcheckbutton.c        \
        gtkcheckmenuitem.c      \
-       gtkclist.c              \
        gtkcolorbutton.c        \
        gtkcolorsel.c           \
        gtkcolorseldialog.c     \
-       gtkcombo.c              \
        gtkcombobox.c           \
        gtkcomboboxentry.c      \
        gtkcontainer.c          \
-       gtkctree.c              \
        gtkcurve.c              \
        gtkdialog.c             \
        gtkdrawingarea.c        \
@@ -455,7 +441,6 @@ gtk_base_c_sources =            \
        gtkfilechooserutils.c   \
        gtkfilechooserwidget.c  \
        gtkfilefilter.c         \
-       gtkfilesel.c            \
        gtkfilesystem.c         \
        gtkfilesystemmodel.c    \
        gtkfixed.c              \
@@ -487,13 +472,10 @@ gtk_base_c_sources =            \
        gtkinputdialog.c        \
        gtkinvisible.c          \
        gtkitem.c               \
-       gtkitemfactory.c        \
        gtkkeyhash.c            \
        gtklabel.c              \
        gtklayout.c             \
        gtklinkbutton.c         \
-       gtklist.c               \
-       gtklistitem.c           \
        gtkliststore.c          \
        gtkmain.c               \
        gtkmarshal.c            \
@@ -509,21 +491,16 @@ gtk_base_c_sources =            \
        gtkmodules.c            \
        gtknotebook.c           \
        gtkobject.c             \
-       gtkoldeditable.c        \
-       gtkoptionmenu.c         \
        gtkpagesetup.c          \
        gtkpaned.c              \
        gtkpapersize.c          \
        gtkpathbar.c            \
-       gtkpixmap.c             \
        gtkplug.c               \
-       gtkpreview.c            \
        gtkprintcontext.c       \
        gtkprintoperation.c     \
        gtkprintoperationpreview.c      \
        gtkprintsettings.c      \
        gtkprintutils.c         \
-       gtkprogress.c           \
        gtkprogressbar.c        \
        gtkradioaction.c        \
        gtkradiobutton.c        \
@@ -551,7 +528,6 @@ gtk_base_c_sources =            \
        gtkseparatormenuitem.c  \
        gtkseparatortoolitem.c  \
        gtksettings.c           \
-       gtksignal.c             \
        gtksizegroup.c          \
        gtksocket.c             \
        gtkspinbutton.c         \
@@ -562,7 +538,6 @@ gtk_base_c_sources =            \
        gtktable.c              \
        gtktearoffmenuitem.c    \
        gtktestutils.c          \
-       gtktext.c               \
        gtktextbtree.c          \
        gtktextbuffer.c         \
        gtktextbufferrichtext.c \
@@ -579,19 +554,16 @@ gtk_base_c_sources =            \
        gtktextutil.c           \
        gtktextview.c           \
        gtkthemes.c             \
-       gtktipsquery.c          \
        gtktoggleaction.c       \
        gtktogglebutton.c       \
        gtktoggletoolbutton.c   \
        gtktoolbar.c            \
        gtktoolbutton.c         \
        gtktoolitem.c           \
+       gtktoolshell.c          \
        gtktooltip.c            \
-       gtktooltips.c           \
-       gtktree.c               \
        gtktreedatalist.c       \
        gtktreednd.c            \
-       gtktreeitem.c           \
        gtktreemodel.c          \
        gtktreemodelfilter.c    \
        gtktreemodelsort.c      \
@@ -616,6 +588,51 @@ gtk_base_c_sources =            \
        gtkwindow-decorate.c    \
        gtkwindow.c             \
        $(gtk_clipboard_dnd_c_sources)
+
+# Broken
+gtk_public_h_sources += \
+       gtktext.h               \
+       gtktree.h               \
+       gtktreeitem.h
+gtk_base_c_sources += \
+       gtktext.c               \
+       gtktree.c               \
+       gtktreeitem.c
+
+# Deprecated
+gtk_public_h_sources += \
+       gtkclist.h              \
+       gtkcombo.h              \
+       gtkctree.h              \
+       gtkfilesel.h            \
+       gtkitemfactory.h        \
+       gtklist.h               \
+       gtklistitem.h           \
+       gtkoldeditable.h        \
+       gtkoptionmenu.h         \
+       gtkpixmap.h             \
+       gtkpreview.h            \
+       gtkprogress.h           \
+       gtksignal.h             \
+       gtktipsquery.h          \
+       gtktooltips.h
+gtk_base_c_sources += \
+       gtkclist.c              \
+       gtkcombo.c              \
+       gtkctree.c              \
+       gtkfilesel.c            \
+       gtkitemfactory.c        \
+       gtklist.c               \
+       gtklistitem.c           \
+       gtkoldeditable.c        \
+       gtkoptionmenu.c         \
+       gtkpixmap.c             \
+       gtkpreview.c            \
+       gtkprogress.c           \
+       gtksignal.c             \
+       gtktipsquery.c          \
+       gtktooltips.c
+
 gtk_c_sources = $(gtk_base_c_sources)
 gtk_all_c_sources = $(gtk_base_c_sources)
 
@@ -795,28 +812,18 @@ gtkmarshal.c: @REBUILD@ gtkmarshal.list
         echo "#define __gtk_marshal_MARSHAL_C__"; \
         echo "#include \"gtkaliasdef.c\"") >> xgen-gmc \
        && cp xgen-gmc gtkmarshal.c \
-       && rm -f xgen-gmc 
+       && rm -f xgen-gmc
 
 gtktypebuiltins.h: stamp-gtktypebuiltins.h
        @true
-stamp-gtktypebuiltins.h: @REBUILD@ $(gtk_public_h_sources) Makefile
-       ( cd $(srcdir) && $(GLIB_MKENUMS) \
-                       --fhead "#ifndef __GTK_TYPE_BUILTINS_H__\n#define __GTK_TYPE_BUILTINS_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 GTK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
-                       --ftail "G_END_DECLS\n\n#endif /* __GTK_TYPE_BUILTINS_H__ */" \
+stamp-gtktypebuiltins.h: @REBUILD@ $(gtk_public_h_sources) gtktypebuiltins.h.template
+       ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtktypebuiltins.h.template \
                $(gtk_public_h_sources) ) >> xgen-gtbh \
        && (cmp -s xgen-gtbh gtktypebuiltins.h || cp xgen-gtbh gtktypebuiltins.h ) \
        && rm -f xgen-gtbh \
        && echo timestamp > $(@F)
-gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) Makefile
-       ( cd $(srcdir) && $(GLIB_MKENUMS) \
-                       --fhead "#undef GTK_DISABLE_DEPRECATED\n#define GTK_ENABLE_BROKEN\n#include \"gtk.h\"\n#include \"gtkprivate.h\"\n#include \"gtkalias.h\"\n" \
-                       --ftail "#define __GTK_TYPE_BUILTINS_C__\n#include \"gtkaliasdef.c\"\n" \
-                       --fprod "\n/* enumerations from \"@filename@\" */" \
-                       --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" \
+gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) gtktypebuiltins.c.template
+       ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtktypebuiltins.c.template \
                $(gtk_public_h_sources) ) > xgen-gtbc \
        && cp xgen-gtbc gtktypebuiltins.c  \
        && rm -f xgen-gtbc
@@ -824,8 +831,9 @@ gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) Makefile
 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 \
+         grep -o '\bg[td]k_[a-zA-Z0-9_]*_get_type\b' | \
+         sort | uniq | \
+         sed '{ s/^/*tp++ = /; s/$$/();/; }' > xgen-gtf \
        && cp xgen-gtf $@ && rm -f xgen-gtf
 gtktestutils.c: gtktypefuncs.c
 
@@ -839,19 +847,16 @@ gtkunixprintincludedir = $(includedir)/gtk-unix-print-2.0/gtk
 gtkunixprintinclude_HEADERS = $(gtk_unix_print_public_h_sources)
 
 libgtk_x11_2_0_la_SOURCES = $(gtk_c_sources)
-libgtk_linux_fb_2_0_la_SOURCES = $(gtk_c_sources)
 libgtk_win32_2_0_la_SOURCES = $(gtk_c_sources)
 libgtk_quartz_2_0_la_SOURCES = $(gtk_c_sources)
 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) -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
 libgtk_win32_2_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32_res)
 libgtk_quartz_2_0_la_LIBADD = $(libadd)
@@ -860,7 +865,7 @@ libgtk_directfb_2_0_la_LIBADD = $(libadd)
 if USE_WIN32
 libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols)
 endif
-EXTRA_LTLIBRARIES = libgtk-x11-2.0.la libgtk-linux-fb-2.0.la libgtk-win32-2.0.la libgtk-quartz-2.0.la libgtk-directfb-2.0.la
+EXTRA_LTLIBRARIES = libgtk-x11-2.0.la libgtk-win32-2.0.la libgtk-quartz-2.0.la libgtk-directfb-2.0.la
 
 install-exec-hook: 
 if DISABLE_EXPLICIT_DEPS
@@ -977,6 +982,7 @@ STOCK_ICONS = \
        stock-icons/16/gtk-network.png                  \
        stock-icons/16/gtk-new.png                      \
        stock-icons/16/gtk-open.png                     \
+       stock-icons/16/gtk-page-setup.png               \
        stock-icons/16/gtk-paste.png                    \
        stock-icons/16/gtk-preferences.png              \
        stock-icons/16/gtk-print.png                    \
@@ -1078,6 +1084,7 @@ STOCK_ICONS = \
        stock-icons/24/gtk-orientation-landscape.png    \
        stock-icons/24/gtk-orientation-reverse-portrait.png     \
        stock-icons/24/gtk-orientation-portrait.png     \
+       stock-icons/24/gtk-page-setup.png               \
        stock-icons/24/gtk-paste.png                    \
        stock-icons/24/gtk-preferences.png              \
        stock-icons/24/gtk-print.png                    \
@@ -1219,6 +1226,9 @@ EXTRA_DIST +=                   \
        makegtkalias.pl         \
        aliasfilescheck.sh      \
        abicheck.sh             \
-       pltcheck.sh
+       pltcheck.sh             \
+       gtktypebuiltins.c.template      \
+       gtktypebuiltins.h.template
+
 
 install-data-local: