diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2014-05-22 09:05:58 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2014-05-22 09:09:55 -0400 |
| commit | 49cf5142ba9e9542e3e848f0fc55c4fd2eaa9f7f (patch) | |
| tree | 2b0794b7842a9d9fe093db0389765ad3dd89b739 /gdk/Makefile.am | |
| parent | c3a9a20839955a98266463c6fad4f0190feaccc2 (diff) | |
| download | gtk+-49cf5142ba9e9542e3e848f0fc55c4fd2eaa9f7f.tar.gz | |
Deprecate GdkColor
It has been replaced by GdkRGBA. Time to make it official.
http://bugzilla.gnome.org/show_bug.cgi?id=636695
Diffstat (limited to 'gdk/Makefile.am')
| -rw-r--r-- | gdk/Makefile.am | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/gdk/Makefile.am b/gdk/Makefile.am index ed4540c310..c9fd11d0bb 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -62,11 +62,11 @@ LDADD = \ # # GDK header files for public installation (non-generated) # +# gdk_public_h_sources = \ gdk.h \ gdkapplaunchcontext.h \ gdkcairo.h \ - gdkcolor.h \ gdkcursor.h \ gdkdevice.h \ gdkdevicemanager.h \ @@ -94,6 +94,13 @@ gdk_public_h_sources = \ gdkvisual.h \ gdkwindow.h +deprecated_h_sources = \ + deprecated/gdkcolor.h + +gdk_h_sources = \ + $(gdk_public_h_sources) \ + $(deprecated_h_sources) + gdk_private_headers = \ gdkapplaunchcontextprivate.h \ gdkcursorprivate.h \ @@ -111,11 +118,14 @@ gdk_private_headers = \ gdkvisualprivate.h \ gdkx.h +deprecated_c_sources = \ + deprecated/gdkcolor.c + gdk_c_sources = \ + $(deprecated_c_sources) \ gdk.c \ gdkapplaunchcontext.c \ gdkcairo.c \ - gdkcolor.c \ gdkcursor.c \ gdkdeprecated.c \ gdkdevice.c \ @@ -157,6 +167,9 @@ gdkincludedir = $(includedir)/gtk-3.0/gdk gdkinclude_HEADERS = $(gdk_public_h_sources) gdkenumtypes.h gdkversionmacros.h nodist_gdkinclude_HEADERS = gdkconfig.h +deprecatedincludedir = $(includedir)/gtk-3.0/gdk/deprecated +deprecatedinclude_HEADERS = $(deprecated_h_sources) + common_sources = \ $(gdk_private_headers) \ $(gdk_c_sources) \ @@ -196,7 +209,7 @@ endif if HAVE_INTROSPECTION introspection_files = \ - $(filter-out gdkkeysyms-compat.h, $(gdk_public_h_sources)) \ + $(filter-out gdkkeysyms-compat.h, $(gdk_h_sources)) \ $(gdk_c_sources) \ gdkenumtypes.c \ gdkenumtypes.h @@ -378,15 +391,15 @@ BUILT_SOURCES = \ gdkenumtypes.h: stamp-gdkenumtypes.h @true -stamp-gdkenumtypes.h: $(gdk_public_h_sources) gdkenumtypes.h.template +stamp-gdkenumtypes.h: $(gdk_h_sources) gdkenumtypes.h.template $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gdkenumtypes.h.template \ - $(gdk_public_h_sources) ) >> xgen-geth \ + $(gdk_h_sources) ) >> xgen-geth \ && (cmp -s xgen-geth gdkenumtypes.h || cp xgen-geth gdkenumtypes.h ) \ && rm -f xgen-geth \ && echo timestamp > $(@F) -gdkenumtypes.c: $(gdk_public_h_sources) gdkenumtypes.c.template +gdkenumtypes.c: $(gdk_h_sources) gdkenumtypes.c.template $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gdkenumtypes.c.template \ - $(gdk_public_h_sources) ) > xgen-getc \ + $(gdk_h_sources) ) > xgen-getc \ && cp xgen-getc gdkenumtypes.c \ && rm -f xgen-getc |