diff --git a/gdk/Makefile.am b/gdk/Makefile.am index f425e0803e..860973b73e 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -68,7 +68,7 @@ LDADD = \ gdk_h_sources = \ $(gdk_public_h_sources) \ - $(deprecated_h_sources) + $(gdk_deprecated_h_sources) gdk_private_headers = \ gdk-private.h \ @@ -159,7 +159,7 @@ gdkinclude_HEADERS = $(gdk_public_h_sources) nodist_gdkinclude_HEADERS = gdkconfig.h gdkenumtypes.h gdkversionmacros.h deprecatedincludedir = $(includedir)/gtk-3.0/gdk/deprecated -deprecatedinclude_HEADERS = $(deprecated_h_sources) +deprecatedinclude_HEADERS = $(gdk_deprecated_h_sources) common_sources = \ $(gdk_private_headers) \ diff --git a/gdk/gdk-pub-headers.mak b/gdk/gdk-pub-headers.mak index 450d4b064b..e84c5d0fc3 100644 --- a/gdk/gdk-pub-headers.mak +++ b/gdk/gdk-pub-headers.mak @@ -40,5 +40,5 @@ gdk_public_h_sources = \ gdkvisual.h \ gdkwindow.h -deprecated_h_sources = \ +gdk_deprecated_h_sources = \ deprecated/gdkcolor.h diff --git a/win32/create-lists-msvc.mak b/win32/create-lists-msvc.mak index 9f7eeef712..475c4fb6c9 100644 --- a/win32/create-lists-msvc.mak +++ b/win32/create-lists-msvc.mak @@ -39,7 +39,7 @@ NULL= !if [call create-lists.bat header gdk_headers.mak GDK_PUBLIC_HEADERS] !endif -!if [for %f in ($(gdk_public_h_sources) $(deprecated_h_sources)) do @call create-lists.bat file gdk_headers.mak ../gdk/%f] +!if [for %f in ($(gdk_public_h_sources) $(gdk_deprecated_h_sources)) do @call create-lists.bat file gdk_headers.mak ../gdk/%f] !endif !if [call create-lists.bat footer gdk_headers.mak] diff --git a/win32/generate-msvc.mak b/win32/generate-msvc.mak index ef92ea7452..a252b8df6f 100644 --- a/win32/generate-msvc.mak +++ b/win32/generate-msvc.mak @@ -37,7 +37,7 @@ GDK_GENERATED_SOURCES = \ .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkmarshalers.c \ .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkresources.h \ .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkresources.c \ - .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkversionmacros.h \ + .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkversionmacros.h generate-base-sources: \ .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\config.h \ @@ -85,7 +85,7 @@ generate-base-sources: \ @echo Generating $@... @if not exist $(@D)\ md $(@D) @cd ..\gdk - @$(PYTHON) $(GLIB_MKENUMS) --template $(@F).template $(gdk_public_h_sources) $(deprecated_h_sources) > ..\win32\$@ + @$(PYTHON) $(GLIB_MKENUMS) --template $(@F).template $(gdk_public_h_sources) $(gdk_deprecated_h_sources) > ..\win32\$@ @cd ..\win32 .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkversionmacros.h: ..\gdk\gdkversionmacros.h.in