Updated Norwegian bokmål translation.

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

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 2cacd54907268a2dc7142ebe8cab55c72199cd63..62d5352eea304cb3d14d79ea2ec6cb05e91bd6f8 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -10,11 +10,19 @@ endif
 SUBDIRS = theme-bits . tests
 DIST_SUBDIRS=theme-bits tests
 
+if HAVE_PAPI_CUPS
+GTK_PRINT_BACKENDS=file,papi,cups
+else
 if HAVE_CUPS
 GTK_PRINT_BACKENDS=file,cups
 else
+if HAVE_PAPI
+GTK_PRINT_BACKENDS=file,papi
+else
 GTK_PRINT_BACKENDS=file,lpr
 endif
+endif
+endif
 
 INCLUDES =                                             \
        -DG_LOG_DOMAIN=\"Gtk\"                          \
@@ -33,7 +41,6 @@ INCLUDES =                                            \
        -I$(top_srcdir) -I../gdk                        \
        -I$(top_srcdir)/gdk                             \
        -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf      \
-       -DGDK_PIXBUF_DISABLE_DEPRECATED                 \
        -DGDK_DISABLE_DEPRECATED                        \
        -DGTK_DISABLE_DEPRECATED                        \
        -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED            \
@@ -149,6 +156,7 @@ gtk_public_h_sources =          \
        gtkaccessible.h         \
        gtkaction.h             \
        gtkactiongroup.h        \
+       gtkactivatable.h        \
        gtkadjustment.h         \
        gtkalignment.h          \
        gtkarrow.h              \
@@ -189,6 +197,7 @@ gtk_public_h_sources =          \
        gtkdrawingarea.h        \
        gtkeditable.h           \
        gtkentry.h              \
+       gtkentrybuffer.h        \
        gtkentrycompletion.h    \
        gtkenums.h              \
        gtkeventbox.h           \
@@ -212,6 +221,7 @@ gtk_public_h_sources =          \
        gtkhscale.h             \
        gtkhscrollbar.h         \
        gtkhseparator.h         \
+       gtkhsv.h                \
        gtkiconfactory.h        \
        gtkicontheme.h          \
        gtkiconview.h           \
@@ -221,6 +231,7 @@ gtk_public_h_sources =          \
        gtkimcontextsimple.h    \
        gtkimmodule.h           \
        gtkimmulticontext.h     \
+       gtkinfobar.h            \
        gtkinputdialog.h        \
        gtkinvisible.h          \
        gtkitem.h               \
@@ -240,6 +251,7 @@ gtk_public_h_sources =          \
        gtkmountoperation.h     \
        gtknotebook.h           \
        gtkobject.h             \
+       gtkorientable.h         \
        gtkpagesetup.h          \
        gtkpaned.h              \
        gtkpapersize.h          \
@@ -346,6 +358,7 @@ gtk_private_h_sources =             \
        gtkdndcursors.h         \
        gtkentryprivate.h       \
        gtkbuilderprivate.h     \
+       gtkcustompaperunixdialog.h\
        gtkfilechooserdefault.h \
        gtkfilechooserembed.h   \
        gtkfilechooserentry.h   \
@@ -354,11 +367,11 @@ gtk_private_h_sources =           \
        gtkfilechooserutils.h   \
        gtkfilesystem.h         \
        gtkfilesystemmodel.h    \
-       gtkhsv.h                \
        gtkiconcache.h          \
        gtkintl.h               \
        gtkkeyhash.h            \
        gtkmnemonichash.h       \
+       gtkmountoperationprivate.h \
        gtkpathbar.h            \
        gtkplugprivate.h        \
        gtkprintoperation-private.h\
@@ -397,6 +410,7 @@ gtk_base_c_sources =            \
        gtkaccessible.c         \
        gtkaction.c             \
        gtkactiongroup.c        \
+       gtkactivatable.c        \
        gtkadjustment.c         \
        gtkalignment.c          \
        gtkarrow.c              \
@@ -435,6 +449,7 @@ gtk_base_c_sources =            \
        gtkdrawingarea.c        \
        gtkeditable.c           \
        gtkentry.c              \
+       gtkentrybuffer.c        \
        gtkentrycompletion.c    \
        gtkeventbox.c           \
        gtkexpander.c           \
@@ -476,6 +491,7 @@ gtk_base_c_sources =            \
        gtkimcontextsimple.c    \
        gtkimmodule.c           \
        gtkimmulticontext.c     \
+       gtkinfobar.c            \
        gtkinputdialog.c        \
        gtkinvisible.c          \
        gtkitem.c               \
@@ -499,6 +515,7 @@ gtk_base_c_sources =            \
        gtkmountoperation.c     \
        gtknotebook.c           \
        gtkobject.c             \
+       gtkorientable.c         \
        gtkpagesetup.c          \
        gtkpaned.c              \
        gtkpapersize.c          \
@@ -646,6 +663,7 @@ gtk_c_sources = $(gtk_base_c_sources)
 gtk_all_c_sources = $(gtk_base_c_sources)
 
 gtk_os_unix_c_sources = \
+       gtkcustompaperunixdialog.c      \
        gtkpagesetupunixdialog.c        \
        gtkprinter.c                    \
        gtkprinteroption.c              \
@@ -684,19 +702,23 @@ gtk_use_x11_c_sources = \
        gtkplug-x11.c   \
        gtksocket-x11.c \
        gtkxembed.c     \
-       gtktrayicon-x11.c
+       gtktrayicon-x11.c \
+       gtkmountoperation-x11.c
 gtk_use_win32_c_sources = \
        gtkplug-win32.c   \
        gtksocket-win32.c \
        gtkwin32embed.c   \
-       gtkwin32embedwidget.c
+       gtkwin32embedwidget.c \
+       gtkmountoperation-stub.c
 gtk_use_quartz_c_sources =     \
        gtksearchenginequartz.c \
        gtkplug-stub.c          \
-       gtksocket-stub.c
+       gtksocket-stub.c        \
+       gtkmountoperation-stub.c
 gtk_use_stub_c_sources = \
        gtkplug-stub.c   \
-       gtksocket-stub.c
+       gtksocket-stub.c \
+       gtkmountoperation-stub.c
 gtk_all_c_sources += $(gtk_use_x11_c_sources) $(gtk_use_win32_c_sources) $(gtk_use_quartz_c_sources) $(gtk_use_stub_c_sources)
 if USE_X11
 gtk_private_h_sources += gtkxembed.h gtktrayicon.h xembed.h
@@ -719,12 +741,12 @@ endif
 if USE_QUARTZ
 gtk_clipboard_dnd_c_sources = gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c
 gtk_clipboard_dnd_h_sources = gtkquartz.h
-EXTRA_DIST += gtkquartz.h
 gtk_clipboard_dnd_c_sources_CFLAGS = "-xobjective-c"
 else
 gtk_clipboard_dnd_c_sources = gtkclipboard.c gtkdnd.c
 gtk_clipboard_dnd_c_sources_CFLAGS =
 endif
+EXTRA_DIST += gtkquartz.h
 
 # we use our own built_sources variable rules to avoid automake's
 # BUILT_SOURCES oddities
@@ -775,7 +797,7 @@ gtk_extra_sources =                         \
 #
 # setup GTK+ sources and their dependencies
 #
-MAINTAINERCLEANFILES = $(gtk_built_sources) $(stamp_files) $(GENERATED_ICONS)
+MAINTAINERCLEANFILES = $(gtk_built_sources) $(stamp_files) $(GENERATED_ICONS) stock-icons/icon-theme.cache
 EXTRA_HEADERS =
 EXTRA_DIST += $(gtk_private_h_sources) $(gtk_extra_sources)
 EXTRA_DIST += $(gtk_built_sources)
@@ -1283,3 +1305,5 @@ EXTRA_DIST +=                   \
 
 
 install-data-local:
+
+-include $(top_srcdir)/git.mk