Merge branch 'master' into treeview-refactor

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

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 2340e5cb69a90d755561e1d681692da3a25111d4..6d3edd8a7af4eee9419776a341b47a50aee38611 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -101,7 +101,7 @@ endif
 # This places the generated .def file in srcdir, since it is expected to be there.
 # (The one from a tarball is)
 gtk.def: gtk.symbols
-       (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/gtk.symbols | $(SED) -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g') > $(srcdir)/gtk.def
+       (echo -e EXPORTS; $(CPP) -P -DG_OS_WIN32 - <$(srcdir)/gtk.symbols | $(SED) -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g') > $(srcdir)/gtk.def
 
 TESTS_ENVIRONMENT = srcdir="$(srcdir)" gtk_all_c_sources="$(gtk_all_c_sources)"
 if OS_LINUX
@@ -218,7 +218,6 @@ gtk_public_h_sources =          \
        gtkhbbox.h              \
        gtkhbox.h               \
        gtkhpaned.h             \
-       gtkhruler.h             \
        gtkhscale.h             \
        gtkhscrollbar.h         \
        gtkhseparator.h         \
@@ -273,7 +272,6 @@ gtk_public_h_sources =          \
        gtkrecentchooserwidget.h \
        gtkrecentfilter.h       \
        gtkrecentmanager.h      \
-       gtkruler.h              \
        gtkscale.h              \
        gtkscalebutton.h        \
        gtkscrollable.h         \
@@ -332,7 +330,6 @@ gtk_public_h_sources =          \
        gtkviewport.h           \
        gtkvolumebutton.h       \
        gtkvpaned.h             \
-       gtkvruler.h             \
        gtkvscale.h             \
        gtkvscrollbar.h         \
        gtkvseparator.h         \
@@ -355,6 +352,7 @@ gtk_semi_private_h_sources =    \
 
 # GTK+ header files that don't get installed
 gtk_private_h_sources =                \
+       gtkbuttonprivate.h      \
        gtkquery.h              \
        gtksearchengine.h       \
        gtksearchenginesimple.h \
@@ -486,7 +484,6 @@ gtk_base_c_sources =            \
        gtkhbbox.c              \
        gtkhbox.c               \
        gtkhpaned.c             \
-       gtkhruler.c             \
        gtkhscale.c             \
        gtkhscrollbar.c         \
        gtkhseparator.c         \
@@ -552,7 +549,6 @@ gtk_base_c_sources =            \
        gtkrecentchooser.c      \
        gtkrecentfilter.c       \
        gtkrecentmanager.c      \
-       gtkruler.c              \
        gtkscale.c              \
        gtkscalebutton.c        \
        gtkscrollable.c         \
@@ -620,7 +616,6 @@ gtk_base_c_sources =            \
        gtkvolumebutton.c       \
        gtkviewport.c           \
        gtkvpaned.c             \
-       gtkvruler.c             \
        gtkvscale.c             \
        gtkvscrollbar.c         \
        gtkvseparator.c         \