projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove redundant variable declarations from Makefile.am.
[pspp-builds.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index f87d56c106e846f8c65c637a259089723d8bc72f..e937fa7b612f7de44da463a0c83d129b90926598 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-2,11
+2,15
@@
AUTOMAKE_OPTIONS = gnits 1.10 subdir-objects
AUTOMAKE_OPTIONS = gnits 1.10 subdir-objects
-SUBDIRS = gl
po
+SUBDIRS = gl
DISTCLEANFILES = ./po/stamp-po xconfigure
BUILT_SOURCES =
DISTCLEANFILES = ./po/stamp-po xconfigure
BUILT_SOURCES =
-AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_builddir)/gl
+AM_CPPFLAGS = \
+ -I$(top_srcdir)/gl \
+ -I$(top_builddir)/gl \
+ -DINSTALLDIR=\"$(bindir)\" \
+ -DDOCDIR=\"$(docdir)\"
AM_CFLAGS=
AM_CFLAGS=
@@
-15,8
+19,6
@@
AM_CFLAGS+=-Wall -W -Wwrite-strings -Wstrict-prototypes \
-Wpointer-arith -Wno-sign-compare -Wmissing-prototypes
endif
-Wpointer-arith -Wno-sign-compare -Wmissing-prototypes
endif
-CC_FOR_BUILD = @CC_FOR_BUILD@
-EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
.q.c:
@$(MKDIR_P) `dirname $@`
./src/language/lexer/q2c$(EXEEXT_FOR_BUILD) $< $@
.q.c:
@$(MKDIR_P) `dirname $@`
./src/language/lexer/q2c$(EXEEXT_FOR_BUILD) $< $@
@@
-31,6
+33,7
@@
EXTRA_DIST = OChangeLog ONEWS config.rpath pspp-mode.el
CLEANFILES =
CLEAN_LOCAL =
CLEANFILES =
CLEAN_LOCAL =
+ALL_LOCAL =
ACLOCAL_AMFLAGS = -I m4 -I gl/m4
noinst_LIBRARIES=
noinst_LTLIBRARIES=
ACLOCAL_AMFLAGS = -I m4 -I gl/m4
noinst_LIBRARIES=
noinst_LTLIBRARIES=
@@
-41,6
+44,7
@@
DIST_HOOKS =
INSTALL_DATA_HOOKS =
UNINSTALL_DATA_HOOKS =
PHONY =
INSTALL_DATA_HOOKS =
UNINSTALL_DATA_HOOKS =
PHONY =
+SUFFIXES = .q
generate-changelog:
if test -d $(top_srcdir)/.git; then \
generate-changelog:
if test -d $(top_srcdir)/.git; then \
@@
-53,6
+57,7
@@
generate-changelog:
DIST_HOOKS += generate-changelog
DIST_HOOKS += generate-changelog
+include $(top_srcdir)/po/automake.mk
include $(top_srcdir)/lib/automake.mk
include $(top_srcdir)/doc/automake.mk
include $(top_srcdir)/config/automake.mk
include $(top_srcdir)/lib/automake.mk
include $(top_srcdir)/doc/automake.mk
include $(top_srcdir)/config/automake.mk
@@
-80,3
+85,7
@@
install-data-hook: $(INSTALL_DATA_HOOKS)
uninstall-hook: $(UNINSTALL_DATA_HOOKS)
clean-local: $(CLEAN_LOCAL)
uninstall-hook: $(UNINSTALL_DATA_HOOKS)
clean-local: $(CLEAN_LOCAL)
+all-local: $(ALL_LOCAL)
+
+# A convenience target to build all the binaries
+programs: $(PROGRAMS)