mirror of
				https://github.com/Ryujinx/GtkSharp.git
				synced 2025-11-04 13:04:53 +00:00 
			
		
		
		
	build: fix automake warning about preprocessor C flags
With automake version 1.13.2 (which comes in debian testing/jessie), we were starting to get these warnings by default: ... Running automake --foreign ... atk/glue/Makefile.am:16: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') gio/glue/Makefile.am:11: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') gtk/glue/Makefile.am:18: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') gtk/gui-thread-check/profiler/Makefile.am:8: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') pango/glue/Makefile.am:13: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') sample/opaquetest/Makefile.am:18: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') sample/valtest/Makefile.am:18: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') Running autoconf ... ... We simply follow the warning's recommendation of using AM_CPPFLAGS instead (CPP meaning C PreProcessor, not C Plus Plus), as explained in http://www.gnu.org/software/automake/manual/html_node/Program-Variables.html The deprecation of INCLUDES has been very long there already (since 2002, therefore Automake 1.7), and we already depend on automake 1.10.
This commit is contained in:
		
							parent
							
								
									1a1300c762
								
							
						
					
					
						commit
						10d3293d3f
					
				| 
						 | 
				
			
			@ -13,7 +13,7 @@ nodist_libatksharpglue_3_la_SOURCES = generated.c
 | 
			
		|||
 | 
			
		||||
libatksharpglue_3_la_LIBADD = $(ATK_LIBS)
 | 
			
		||||
 | 
			
		||||
INCLUDES = $(ATK_CFLAGS) $(GTK_SHARP_VERSION_CFLAGS) -I$(top_srcdir)
 | 
			
		||||
AM_CPPFLAGS = $(ATK_CFLAGS) $(GTK_SHARP_VERSION_CFLAGS) -I$(top_srcdir)
 | 
			
		||||
 | 
			
		||||
libatksharpglue.dll: $(libatksharpglue_3_la_OBJECTS) libatksharpglue.rc libatksharpglue.def
 | 
			
		||||
	./build-dll libatksharpglue-3 $(VERSION)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -8,7 +8,7 @@ libgiosharpglue_3_la_LDFLAGS = -module -avoid-version -no-undefined
 | 
			
		|||
 | 
			
		||||
libgiosharpglue_3_la_LIBADD = $(GIO_LIBS)
 | 
			
		||||
 | 
			
		||||
INCLUDES = $(GIO_CFLAGS) $(GTK_SHARP_VERSION_CFLAGS) -I$(top_srcdir)
 | 
			
		||||
AM_CPPFLAGS = $(GIO_CFLAGS) $(GTK_SHARP_VERSION_CFLAGS) -I$(top_srcdir)
 | 
			
		||||
 | 
			
		||||
libgiosharpglue.dll: $(libgiosharpglue_3_la_OBJECTS) libgiosharpglue.rc libgiosharpglue.def
 | 
			
		||||
	./build-dll libgiosharpglue-3 $(VERSION)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -15,7 +15,7 @@ libgtksharpglue_3_la_LDFLAGS = -module -avoid-version -no-undefined
 | 
			
		|||
 | 
			
		||||
libgtksharpglue_3_la_LIBADD = $(GTK_LIBS)
 | 
			
		||||
 | 
			
		||||
INCLUDES = $(GTK_CFLAGS) $(GTK_SHARP_VERSION_CFLAGS) -I$(top_srcdir)
 | 
			
		||||
AM_CPPFLAGS = $(GTK_CFLAGS) $(GTK_SHARP_VERSION_CFLAGS) -I$(top_srcdir)
 | 
			
		||||
 | 
			
		||||
libgtksharpglue.dll: $(libgtksharpglue_3_la_OBJECTS) libgtksharpglue.rc libgtksharpglue.def
 | 
			
		||||
	./build-dll libgtksharpglue-3 $(VERSION)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -5,4 +5,4 @@ libmono_profiler_gui_thread_check_la_SOURCES = gui-thread-check.c
 | 
			
		|||
 | 
			
		||||
libmono_profiler_gui_thread_check_la_LIBADD = @PROFILER_LIBS@
 | 
			
		||||
 | 
			
		||||
INCLUDES = @PROFILER_CFLAGS@ -Wall
 | 
			
		||||
AM_CPPFLAGS = @PROFILER_CFLAGS@ -Wall
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -10,7 +10,7 @@ libpangosharpglue_3_la_LDFLAGS = -module -avoid-version -no-undefined
 | 
			
		|||
 | 
			
		||||
libpangosharpglue_3_la_LIBADD = $(PANGO_LIBS)
 | 
			
		||||
 | 
			
		||||
INCLUDES = $(PANGO_CFLAGS) $(GTK_SHARP_VERSION_CFLAGS) -I$(top_srcdir)
 | 
			
		||||
AM_CPPFLAGS = $(PANGO_CFLAGS) $(GTK_SHARP_VERSION_CFLAGS) -I$(top_srcdir)
 | 
			
		||||
 | 
			
		||||
libpangosharpglue.dll: $(libpangosharpglue_3_la_OBJECTS) libpangosharpglue.rc libpangosharpglue.def
 | 
			
		||||
	./build-dll libpangosharpglue-3 $(VERSION)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -15,7 +15,7 @@ libopaque_la_LDFLAGS = -module -avoid-version -no-undefined
 | 
			
		|||
 | 
			
		||||
libopaque_la_LIBADD = $(GTK_LIBS)
 | 
			
		||||
 | 
			
		||||
INCLUDES = $(GTK_CFLAGS)
 | 
			
		||||
AM_CPPFLAGS = $(GTK_CFLAGS)
 | 
			
		||||
 | 
			
		||||
generated/*.cs: opaque-api.xml
 | 
			
		||||
	$(RUNTIME) ../../generator/gapi_codegen.exe --generate $(srcdir)/opaque-api.xml	\
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -15,7 +15,7 @@ libvalobj_la_LDFLAGS = -module -avoid-version -no-undefined
 | 
			
		|||
 | 
			
		||||
libvalobj_la_LIBADD = $(GTK_LIBS)
 | 
			
		||||
 | 
			
		||||
INCLUDES = $(GTK_CFLAGS)
 | 
			
		||||
AM_CPPFLAGS = $(GTK_CFLAGS)
 | 
			
		||||
 | 
			
		||||
Valobj.cs: valobj-api.xml
 | 
			
		||||
	$(RUNTIME) ../../generator/gapi_codegen.exe --generate $(srcdir)/valobj-api.xml	\
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue