Fix up linker flags

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

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index d35170a9d31869845baf336be82f4004d6651d10..6d1318de99e3376bd9ab4fffa5a3b177bfcb9b5d 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1,5 +1,15 @@
 # Makefile.am for gtk+/gtk
 include $(top_srcdir)/Makefile.decl
+include $(INTROSPECTION_MAKEFILE)
+INTROSPECTION_GIRS =
+INTROSPECTION_SCANNER_ARGS = \
+       --add-include-path=../gdk-pixbuf \
+       --add-include-path=../gdk
+INTROSPECTION_COMPILER_ARGS = \
+       --includedir=$(srcdir) \
+    --includedir=. \
+    --includedir=../gdk-pixbuf \
+    --includedir=../gdk
 
 if USE_QUARTZ
 GTK_PRINT_PREVIEW_COMMAND="open -a /Applications/Preview.app %f"
@@ -191,7 +201,6 @@ gtk_public_h_sources =          \
        gtkcombobox.h           \
        gtkcomboboxentry.h      \
        gtkcontainer.h          \
-       gtkcurve.h              \
        gtkdebug.h              \
        gtkdialog.h             \
        gtkdnd.h                \
@@ -203,6 +212,7 @@ gtk_public_h_sources =          \
        gtkenums.h              \
        gtkeventbox.h           \
        gtkexpander.h           \
+       gtkextendedlayout.h     \
        gtkfilechooser.h        \
        gtkfilechooserbutton.h  \
        gtkfilechooserdialog.h  \
@@ -212,7 +222,6 @@ gtk_public_h_sources =          \
        gtkfontbutton.h         \
        gtkfontsel.h            \
        gtkframe.h              \
-       gtkgamma.h              \
        gtkgc.h                 \
        gtkhandlebox.h          \
        gtkhbbox.h              \
@@ -312,6 +321,8 @@ gtk_public_h_sources =          \
        gtktoolbar.h            \
        gtktoolbutton.h         \
        gtktoolitem.h           \
+       gtktoolitemgroup.h      \
+       gtktoolpalette.h        \
        gtktoolshell.h          \
        gtktooltip.h            \
        gtktreednd.h            \
@@ -393,6 +404,7 @@ gtk_private_h_sources =             \
        gtktextutil.h           \
        gtkthemes.h             \
        gtktoggleactionprivate.h\
+       gtktoolpaletteprivate.h \
        gtktreedatalist.h       \
        gtktreeprivate.h        \
        gtkwindow-decorate.h    \
@@ -446,7 +458,6 @@ gtk_base_c_sources =            \
        gtkcombobox.c           \
        gtkcomboboxentry.c      \
        gtkcontainer.c          \
-       gtkcurve.c              \
        gtkdialog.c             \
        gtkdrawingarea.c        \
        gtkeditable.c           \
@@ -455,6 +466,7 @@ gtk_base_c_sources =            \
        gtkentrycompletion.c    \
        gtkeventbox.c           \
        gtkexpander.c           \
+       gtkextendedlayout.c     \
        gtkfilechooser.c        \
        gtkfilechooserbutton.c  \
        gtkfilechooserdefault.c \
@@ -471,7 +483,6 @@ gtk_base_c_sources =            \
        gtkfontbutton.c         \
        gtkfontsel.c            \
        gtkframe.c              \
-       gtkgamma.c              \
        gtkgc.c                 \
        gtkhandlebox.c          \
        gtkhbbox.c              \
@@ -589,6 +600,8 @@ gtk_base_c_sources =            \
        gtktoolbar.c            \
        gtktoolbutton.c         \
        gtktoolitem.c           \
+       gtktoolitemgroup.c              \
+       gtktoolpalette.c        \
        gtktoolshell.c          \
        gtktooltip.c            \
        gtktreedatalist.c       \
@@ -633,7 +646,9 @@ gtk_public_h_sources += \
        gtkclist.h              \
        gtkcombo.h              \
        gtkctree.h              \
+       gtkcurve.h              \
        gtkfilesel.h            \
+       gtkgamma.h              \
        gtkinputdialog.h        \
        gtkitemfactory.h        \
        gtklist.h               \
@@ -650,7 +665,9 @@ gtk_base_c_sources += \
        gtkclist.c              \
        gtkcombo.c              \
        gtkctree.c              \
+       gtkcurve.c              \
        gtkfilesel.c            \
+       gtkgamma.c              \
        gtkitemfactory.c        \
        gtklist.c               \
        gtklistitem.c           \
@@ -915,8 +932,19 @@ if DISABLE_EXPLICIT_DEPS
        $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/$(gtktargetlib)
 endif
 
+if USE_QUARTZ
+install-mac-key-theme:
+       $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Mac/gtk-2.0-key
+       $(INSTALL_DATA) $(srcdir)/gtkrc.key.mac $(DESTDIR)$(datadir)/themes/Mac/gtk-2.0-key/gtkrc
+uninstall-mac-key-theme:
+       rm -f $(DESTDIR)$(datadir)/themes/Mac/gtk-2.0-key/gtkrc
+else
+install-mac-key-theme:
+uninstall-mac-key-theme:
+endif
+
 # Install a RC file for the default GTK+ theme, and key themes
-install-data-local: install-ms-lib install-def-file
+install-data-local: install-ms-lib install-def-file install-mac-key-theme
        $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Raleigh/gtk-2.0
        $(INSTALL_DATA) $(srcdir)/gtkrc.default $(DESTDIR)$(datadir)/themes/Raleigh/gtk-2.0/gtkrc
        $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk-2.0-key
@@ -924,7 +952,7 @@ install-data-local: install-ms-lib install-def-file
        $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Emacs/gtk-2.0-key
        $(INSTALL_DATA) $(srcdir)/gtkrc.key.emacs $(DESTDIR)$(datadir)/themes/Emacs/gtk-2.0-key/gtkrc
 
-uninstall-local: uninstall-ms-lib uninstall-def-file
+uninstall-local: uninstall-ms-lib uninstall-def-file uninstall-mac-key-theme
        rm -f $(DESTDIR)$(datadir)/themes/Raleigh/gtk-2.0/gtkrc
        rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-2.0-key/gtkrc
        rm -f $(DESTDIR)$(datadir)/themes/Emacs/gtk-2.0-key/gtkrc
@@ -943,7 +971,36 @@ TEST_DEPS = $(DEPS) gtk.immodules
 LDADDS =                                                               \
        $(gtktargetlib)                                                 \
        $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
-       $(top_builddir)/gdk/$(gdktargetlib)
+       $(top_builddir)/gdk/$(gdktargetlib)                             \
+       $(GTK_DEP_LIBS)
+
+if HAVE_INTROSPECTION
+introspection_files = \
+    $(gtkinclude_HEADERS) \
+    $(gtk_all_c_sources) \
+    gtktypebuiltins.h \
+    gtktypebuiltins.c
+
+Gtk-2.0.gir: $(INTROSPECTION_SCANNER) $(gtktargetlib) Makefile
+Gtk_2_0_gir_SCANNERFLAGS = --strip-prefix=Gtk
+Gtk_2_0_gir_INCLUDES = Atk-1.0 Gdk-2.0
+Gtk_2_0_gir_CFLAGS = \
+               $(INCLUDES) \
+               -UGDK_DISABLE_DEPRECATED \
+               -UGTK_DISABLE_DEPRECATED \
+               -DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
+Gtk_2_0_gir_LIBS = $(gtktargetlib)
+Gtk_2_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files))
+INTROSPECTION_GIRS += Gtk-2.0.gir
+
+girdir = $(INTROSPECTION_GIRDIR)
+dist_gir_DATA = $(INTROSPECTION_GIRS)
+
+typelibsdir = $(INTROSPECTION_TYPELIBDIR)
+typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+
+CLEANFILES += $(dist_gir_DATA) $(typelibs_DATA)
+endif
 
 #
 # Installed tools
@@ -992,7 +1049,7 @@ gtk_query_immodules_2_0_LDADD = $(LDADDS)
 
 gtk_query_immodules_2_0_SOURCES = queryimmodules.c
 
-gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
+gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(LDADDS)
 
 gtk_update_icon_cache_SOURCES = \
        updateiconcache.c 
@@ -1332,6 +1389,7 @@ EXTRA_DIST +=                   \
        gtkrc.default           \
        gtkrc.key.default       \
        gtkrc.key.emacs         \
+       gtkrc.key.mac           \
        makefile.msc            \
        makefile.msc.in         \
        makegtkalias.pl         \