[PATCH libXaw3d 10/11] Remove AM_PROG_CC_C_O
Yaakov (Cygwin/X)
yselkowitz at users.sourceforge.net
Wed Aug 24 04:12:02 PDT 2011
From: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
There is no need for a per-target CFLAGS or CPPFLAGS, as unlike libXaw,
we are building only one target.
Signed-off-by: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
---
configure.ac | 3 ---
src/Makefile.am | 18 +++++++++---------
2 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/configure.ac b/configure.ac
index d60a7a8..0af56e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,9 +19,6 @@ m4_ifndef([XORG_MACROS_VERSION],
XORG_MACROS_VERSION(1.4)
XORG_DEFAULT_OPTIONS
-# Some compilers do not support per target -c and -o flags
-AM_PROG_CC_C_O
-
# Checks for header files.
PKG_CHECK_MODULES(X11, [x11 xt xmu])
AC_CHECK_HEADERS([wctype.h wchar.h widec.h])
diff --git a/src/Makefile.am b/src/Makefile.am
index 23bac41..b1a2a31 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,14 @@
lib_LTLIBRARIES = libXaw3d.la
+AM_CFLAGS = \
+ $(CWARNFLAGS)
+
+AM_CPPFLAGS = \
+ -I${top_srcdir}/include \
+ -I${top_srcdir}/include/X11/Xaw3d \
+ $(XAW3D_CFLAGS) \
+ $(X11_CFLAGS) $(XPM_CFLAGS)
+
#
# This doesn't appear to be used on any
# current systems -- it requires SUNSHLIB and !SHAREDCODE,
@@ -56,18 +65,9 @@ libXaw3d_la_SOURCES = \
laylex.l \
$(I18N_SRCS)
-libXaw3d_la_CFLAGS = \
- $(CWARNFLAGS)
-
libXaw3d_la_LIBADD = \
$(X11_LIBS) $(XPM_LIBS)
-libXaw3d_la_CPPFLAGS = \
- -I${top_srcdir}/include \
- -I${top_srcdir}/include/X11/Xaw3d \
- $(XAW3D_CFLAGS) \
- $(X11_CFLAGS) $(XPM_CFLAGS)
-
libXaw3d_la_LDFLAGS = -version-info 8:0:0 -no-undefined
EXTRA_DIST = laygram.h sharedlib.c Template.c
--
1.7.5.1
More information about the xorg-devel
mailing list