summaryrefslogtreecommitdiff
path: root/lib/libXtst/src
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2013-05-31 15:41:58 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2013-05-31 15:41:58 +0000
commit64f43c01e2d90eebf8e4c0d466d8eb7969816d6c (patch)
tree18b31cae54a50eafeb31a10508de0628c975c269 /lib/libXtst/src
parent2f8b31c07c92215d04ca7112aadd14f45d5fce8a (diff)
Update to libXtst 1.2.2
Diffstat (limited to 'lib/libXtst/src')
-rw-r--r--lib/libXtst/src/Makefile.am6
-rw-r--r--lib/libXtst/src/Makefile.in13
2 files changed, 11 insertions, 8 deletions
diff --git a/lib/libXtst/src/Makefile.am b/lib/libXtst/src/Makefile.am
index 1091ece76..67bf36e2b 100644
--- a/lib/libXtst/src/Makefile.am
+++ b/lib/libXtst/src/Makefile.am
@@ -6,9 +6,11 @@ libXtst_la_SOURCES = \
libXtst_la_LIBADD = @XTST_LIBS@
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/include \
- -I$(top_srcdir)/include/X11/extensions \
+ -I$(top_srcdir)/include/X11/extensions
+
+AM_CFLAGS = \
$(XTST_CFLAGS) \
$(CWARNFLAGS)
diff --git a/lib/libXtst/src/Makefile.in b/lib/libXtst/src/Makefile.in
index c5550ac42..24733948d 100644
--- a/lib/libXtst/src/Makefile.in
+++ b/lib/libXtst/src/Makefile.in
@@ -204,7 +204,6 @@ LINT_FLAGS = @LINT_FLAGS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MAN_SUBSTS = @MAN_SUBSTS@
@@ -299,9 +298,11 @@ libXtst_la_SOURCES = \
XTest.c
libXtst_la_LIBADD = @XTST_LIBS@
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/include \
- -I$(top_srcdir)/include/X11/extensions \
+ -I$(top_srcdir)/include/X11/extensions
+
+AM_CFLAGS = \
$(XTST_CFLAGS) \
$(CWARNFLAGS)
@@ -317,7 +318,7 @@ all: all-am
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -342,9 +343,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure: $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
install-libLTLIBRARIES: $(lib_LTLIBRARIES)