summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2008-12-02 02:25:41 -0200
committerPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2008-12-02 02:25:41 -0200
commite7d66545e71cdd223761ce14416cbebccbd6dd75 (patch)
tree9e846ac9ebe3244417a699c8cf6d77b8afc994fa /Makefile.am
parent99faa7b727a5441b0dfeed72f43571a85ff0a079 (diff)
Use new XORG_CWARNFLAGS and XORG_CHANGELOG macros.
Also correct a possible uninitialized variable.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am14
1 files changed, 7 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am
index 0fad032..24aabef 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,7 @@ noinst_PROGRAMS = lisp/lsp lisp/re/tests
# libmp.a
#
-libmp_a_CFLAGS =
+libmp_a_CFLAGS = $(CWARNFLAGS)
libmp_a_SOURCES = \
lisp/mp/mp.c \
lisp/mp/mp.h \
@@ -38,7 +38,7 @@ libmp_a_SOURCES = \
# liblisp.a
#
-liblisp_a_CFLAGS = -I$(top_srcdir)/lisp/re -I$(top_srcdir)/lisp/mp -DLISP -DLISPDIR=\"$(LISPDIR)\" $(PKGDEPS_CFLAGS)
+liblisp_a_CFLAGS = $(CWARNFLAGS) -I$(top_srcdir)/lisp/re -I$(top_srcdir)/lisp/mp -DLISP -DLISPDIR=\"$(LISPDIR)\" $(PKGDEPS_CFLAGS)
liblisp_a_SOURCES = \
lisp/bytecode.c \
lisp/bytecode.h \
@@ -91,7 +91,7 @@ endif
# libre.a
#
-libre_a_CFLAGS =
+libre_a_CFLAGS = $(CWARNFLAGS)
libre_a_SOURCES = \
lisp/re/re.c \
lisp/re/rec.c \
@@ -103,7 +103,7 @@ libre_a_SOURCES = \
# xedit
#
xedit_DEPENDENCIES = liblisp.a libmp.a libre.a
-xedit_CFLAGS = $(PKGDEPS_CFLAGS) -I$(top_srcdir)/lisp/re -D_BSD_SOURCE -DXEDIT
+xedit_CFLAGS = $(CWARNFLAGS) $(PKGDEPS_CFLAGS) -I$(top_srcdir)/lisp/re -D_BSD_SOURCE -DXEDIT
xedit_LDADD = -L. -lre -llisp -lmp $(PKGDEPS_LIBS) -lm
xedit_SOURCES = \
@@ -140,7 +140,7 @@ endif
# lisp/lsp
lisp_lsp_DEPENDENCIES = liblisp.a libre.a libmp.a
-lisp_lsp_CFLAGS = -I$(top_srcdir)/lisp/re -I$(top_srcdir)/lisp/mp -DLISP -DLISPDIR=\"@LISPDIR@\" -D_BSD_SOURCE
+lisp_lsp_CFLAGS = $(CWARNFLAGS) -I$(top_srcdir)/lisp/re -I$(top_srcdir)/lisp/mp -DLISP -DLISPDIR=\"@LISPDIR@\" -D_BSD_SOURCE
lisp_lsp_LDADD = -L. -llisp -lre -lmp -lm
lisp_lsp_SOURCES = \
hash.c \
@@ -156,7 +156,7 @@ endif
# re/tests
lisp_re_tests_DEPENDENCIES = libre.a
-lisp_re_tests_CFLAGS = -I$(top_srcdir)/lisp/re -D_BSD_SOURCE
+lisp_re_tests_CFLAGS = $(CWARNFLAGS) -I$(top_srcdir)/lisp/re -D_BSD_SOURCE
lisp_re_tests_LDADD = -L. -lre
lisp_re_tests_SOURCES = lisp/re/tests.c
@@ -258,6 +258,6 @@ MAINTAINERCLEANFILES = ChangeLog
.PHONY: ChangeLog
ChangeLog:
- (GIT_DIR=$(top_srcdir)/.git git log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+ $(CHANGELOG_CMD)
dist-hook: ChangeLog