summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2009-10-08 00:23:42 -0700
committerAlan Coopersmith <alan.coopersmith@sun.com>2009-10-08 00:23:48 -0700
commitc302ae79f7819f75628f798d15c980cbf42eec91 (patch)
treefc234cff9d29ad8142bff81cc5d4e2785e87b26a /src
parent3418a26aa83fbba78ad5a214ca7db2984a44190b (diff)
downloadxorg-lib-libXcomposite-c302ae79f7819f75628f798d15c980cbf42eec91.tar.gz
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Also some changes to man/Makefile.am to make it work better with the AM_SILENT_RULES option that's enabled in XORG_DEFAULT_OPTIONS Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index a7d8269..e7b9db8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,7 +19,8 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
-AM_CFLAGS = $(XCOMPOSITE_CFLAGS) $(X_CFLAGS) -I$(top_srcdir)/include
+AM_CFLAGS = $(CWARNFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/include
lib_LTLIBRARIES = libXcomposite.la