mirror of
https://gitlab.gnome.org/GNOME/gimp
synced 2024-10-21 03:52:33 +00:00
libgimp/Makefile.am (GTKDOC_CFLAGS) undef GTK_DISABLE_SINGLE_INCLUDES and
2008-05-30 Michael Natterer <mitch@gimp.org> * libgimp/Makefile.am (GTKDOC_CFLAGS) * libgimpwidgets/Makefile.am (GTKDOC_CFLAGS): undef GTK_DISABLE_SINGLE_INCLUDES and GIMP_DISABLE_DEPRECATED here. * libgimpwidgets/libgimpwidgets.types: don't try to #define or #undef anything here. svn path=/trunk/; revision=25869
This commit is contained in:
parent
763e60965b
commit
57417566b2
|
@ -1,3 +1,12 @@
|
|||
2008-05-30 Michael Natterer <mitch@gimp.org>
|
||||
|
||||
* libgimp/Makefile.am (GTKDOC_CFLAGS)
|
||||
* libgimpwidgets/Makefile.am (GTKDOC_CFLAGS): undef
|
||||
GTK_DISABLE_SINGLE_INCLUDES and GIMP_DISABLE_DEPRECATED here.
|
||||
|
||||
* libgimpwidgets/libgimpwidgets.types: don't try to #define or
|
||||
#undef anything here.
|
||||
|
||||
2008-05-29 Sven Neumann <sven@gimp.org>
|
||||
|
||||
* libgimpwidgets/libgimpwidgets-sections.txt
|
||||
|
|
|
@ -47,16 +47,17 @@ GTKDOC_CFLAGS = \
|
|||
@CFLAGS@ \
|
||||
-I$(top_srcdir) \
|
||||
-I$(top_builddir) \
|
||||
@GTK_CFLAGS@
|
||||
@GTK_CFLAGS@ \
|
||||
-UGTK_DISABLE_SINGLE_INCLUDES
|
||||
|
||||
GTKDOC_LIBS = \
|
||||
$(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la \
|
||||
$(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la \
|
||||
$(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la \
|
||||
$(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).la \
|
||||
$(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la \
|
||||
$(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la \
|
||||
$(top_builddir)/libgimp/libgimpui-$(GIMP_API_VERSION).la \
|
||||
$(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la \
|
||||
$(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la \
|
||||
$(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la \
|
||||
$(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).la \
|
||||
$(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la \
|
||||
$(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la \
|
||||
$(top_builddir)/libgimp/libgimpui-$(GIMP_API_VERSION).la \
|
||||
@GTK_LIBS@
|
||||
|
||||
|
||||
|
|
|
@ -46,11 +46,13 @@ extra_files =
|
|||
# CFLAGS and LDFLAGS for compiling scan program. Only needed
|
||||
# if $(DOC_MODULE).types is non-empty.
|
||||
GTKDOC_CFLAGS = \
|
||||
@CFLAGS@ \
|
||||
-I$(top_srcdir) \
|
||||
-I$(top_builddir) \
|
||||
@GTK_CFLAGS@ \
|
||||
-DGIMP_ENABLE_CONTROLLER_UNDER_CONSTRUCTION
|
||||
@CFLAGS@ \
|
||||
-I$(top_srcdir) \
|
||||
-I$(top_builddir) \
|
||||
@GTK_CFLAGS@ \
|
||||
-DGIMP_ENABLE_CONTROLLER_UNDER_CONSTRUCTION \
|
||||
-UGTK_DISABLE_SINGLE_INCLUDES \
|
||||
-UGIMP_DISABLE_DEPRECATED
|
||||
|
||||
GTKDOC_LIBS = \
|
||||
$(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la \
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
#include <gtk/gtk.h>
|
||||
#undef GIMP_DISABLE_DEPRECATED
|
||||
#include <libgimpwidgets/gimpwidgets.h>
|
||||
#include <libgimpwidgets/gimpcontroller.h>
|
||||
|
||||
|
|
Loading…
Reference in a new issue