summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas E. Dickey <dickey@invisible-island.net>2019-11-25 17:57:14 -0500
committerThomas E. Dickey <dickey@invisible-island.net>2019-11-25 20:50:53 -0500
commit78f66e92c66ad637da33df454a7aae149476e765 (patch)
treeb49d2865816d0fcdc010cdafd3dd44b3e5ed3f58
parent15860a8e2804243777c1e3d1fc997b9d6a500cb5 (diff)
downloadxorg-lib-libXaw-78f66e92c66ad637da33df454a7aae149476e765.tar.gz
change COMMON_CFLAGS and COMMON_CPPFLAGS to AM_CFLAGS and AM_CPPFLAGS
respectively so the default .c.o rule works (needed for the "Regress" script). Signed-off-by: Thomas E. Dickey <dickey@invisible-island.net>
-rw-r--r--src/Makefile.am16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index befd850..b5f2bd1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -55,10 +55,10 @@ COMMON_SOURCES = \
XawI18n.c \
XawI18n.h
-COMMON_CFLAGS = \
+AM_CFLAGS = \
$(CWARNFLAGS)
-COMMON_CPPFLAGS = \
+AM_CPPFLAGS = \
-I${top_srcdir}/include \
-DPROJECT_ROOT=\"$(prefix)\"
@@ -67,10 +67,10 @@ if BUILD_XAW6
lib_LTLIBRARIES += libXaw6.la
libXaw6_la_CPPFLAGS = \
- $(COMMON_CPPFLAGS)
+ $(AM_CPPFLAGS)
libXaw6_la_CFLAGS = \
- $(COMMON_CFLAGS) \
+ $(AM_CFLAGS) \
-DOLDXAW \
$(XAW6_CFLAGS)
@@ -105,15 +105,15 @@ if BUILD_XAW7
lib_LTLIBRARIES += libXaw7.la
libXaw7_la_CPPFLAGS = \
- $(COMMON_CPPFLAGS)
+ $(AM_CPPFLAGS)
libXaw7_la_CFLAGS = \
- $(COMMON_CFLAGS) \
+ $(AM_CFLAGS) \
-DXAW7 \
$(XAW7_CFLAGS)
-libXaw7_la_SOURCES = \
- $(COMMON_SOURCES) \
+libXaw7_la_SOURCES = \
+ $(COMMON_SOURCES) \
Tip.c
libXaw7_la_LDFLAGS = -version-info 7:0:0 -no-undefined