From: Sven Panne Date: Wed, 7 Sep 2005 11:53:13 +0000 (+0000) Subject: Use target-specific *_CPPFLAGS, not the deprecated INCLUDES. X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=commitdiff_plain;ds=sidebyside;h=29bebfef2851e51a7fec7dbb26be54a5deeab546;p=freeglut Use target-specific *_CPPFLAGS, not the deprecated INCLUDES. git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@687 7f0cb862-5218-0410-a997-914c9d46530a --- diff --git a/ChangeLog b/ChangeLog index db3c3c1..fc48412 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1145,3 +1145,5 @@ necessary to temporarily use the X11 flags found by AC_PATH_XTRA. (298) Use -Wall for automake to catch some buglets, deprecated stuff, etc. + +(299) Use target-specific *_CPPFLAGS, not the deprecated INCLUDES. diff --git a/src/Makefile.am b/src/Makefile.am index 83dc437..0f55c10 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -45,8 +45,7 @@ lib@LIBRARY@_la_SOURCES = freeglut_callbacks.c \ lib@LIBRARY@_la_LIBADD = $(LIBM) $(X_LIBS) $(GL_LIBS) $(LIBXXF86VM) lib@LIBRARY@_la_LDFLAGS = $(VERSION_INFO) lib@LIBRARY@_la_CFLAGS = $(X_CFLAGS) $(EXPORT_FLAGS) - -INCLUDES = -I$(top_srcdir)/include +lib@LIBRARY@_la_CPPFLAGS= -I$(top_srcdir)/include # # End of file