git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into forward-port
[sliver-openvswitch.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index
115162d
..
932f495
100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-42,9
+42,9
@@
EXTRA_DIST = \
CodingStyle \
DESIGN \
FAQ \
CodingStyle \
DESIGN \
FAQ \
+ INSTALL \
INSTALL.KVM \
INSTALL.Libvirt \
INSTALL.KVM \
INSTALL.Libvirt \
- INSTALL.Linux \
INSTALL.RHEL \
INSTALL.SSL \
INSTALL.XenServer \
INSTALL.RHEL \
INSTALL.SSL \
INSTALL.XenServer \
@@
-108,6
+108,7
@@
SUFFIXES += .in
sed \
-e 's,[@]PKIDIR[@],$(PKIDIR),g' \
-e 's,[@]LOGDIR[@],$(LOGDIR),g' \
sed \
-e 's,[@]PKIDIR[@],$(PKIDIR),g' \
-e 's,[@]LOGDIR[@],$(LOGDIR),g' \
+ -e 's,[@]DBDIR[@],$(DBDIR),g' \
-e 's,[@]PERL[@],$(PERL),g' \
-e 's,[@]PYTHON[@],$(PYTHON),g' \
-e 's,[@]RUNDIR[@],$(RUNDIR),g' \
-e 's,[@]PERL[@],$(PERL),g' \
-e 's,[@]PYTHON[@],$(PYTHON),g' \
-e 's,[@]RUNDIR[@],$(RUNDIR),g' \
@@
-133,13
+134,18
@@
CLEAN_LOCAL += clean-pycov
# If we're checked out from a Git repository, make sure that every
# file that is in Git is distributed.
# If we're checked out from a Git repository, make sure that every
# file that is in Git is distributed.
+#
+# We only enable this check when GNU make is in use because the
+# Makefile in datapath/linux, needed to get the list of files to
+# distribute, requires GNU make extensions.
+if GNU_MAKE
ALL_LOCAL += dist-hook-git
dist-hook-git: distfiles
@if test -e $(srcdir)/.git && (git --version) >/dev/null 2>&1; then \
(cd datapath && $(MAKE) distfiles); \
(cat distfiles; sed 's|^|datapath/|' datapath/distfiles) | \
sort -u > all-distfiles; \
ALL_LOCAL += dist-hook-git
dist-hook-git: distfiles
@if test -e $(srcdir)/.git && (git --version) >/dev/null 2>&1; then \
(cd datapath && $(MAKE) distfiles); \
(cat distfiles; sed 's|^|datapath/|' datapath/distfiles) | \
sort -u > all-distfiles; \
- (cd $(srcdir) && git ls-files) | grep -v
'\.gitignore$$' |
\
+ (cd $(srcdir) && git ls-files) | grep -v
Ff $(srcdir)/.non-distfiles |
\
sort -u > all-gitfiles; \
comm -1 -3 all-distfiles all-gitfiles > missing-distfiles; \
if test -s missing-distfiles; then \
sort -u > all-gitfiles; \
comm -1 -3 all-distfiles all-gitfiles > missing-distfiles; \
if test -s missing-distfiles; then \
@@
-158,6
+164,8
@@
distfiles: Makefile
sed -e "s|^$$srcdirstrip/||;t" \
-e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t" | sort -u > $@
CLEANFILES += distfiles
sed -e "s|^$$srcdirstrip/||;t" \
-e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t" | sort -u > $@
CLEANFILES += distfiles
+endif
+.PHONY: dist-hook-git
# Check that "struct vlog_ratelimit" is always declared "static".
ALL_LOCAL += rate-limit-check
# Check that "struct vlog_ratelimit" is always declared "static".
ALL_LOCAL += rate-limit-check
@@
-169,6
+177,7
@@
rate-limit-check:
echo "'struct vlog_rate_limit' must always be 'static'"; \
exit 1; \
fi
echo "'struct vlog_rate_limit' must always be 'static'"; \
exit 1; \
fi
+.PHONY: rate-limit-check
if HAVE_GROFF
ALL_LOCAL += manpage-check
if HAVE_GROFF
ALL_LOCAL += manpage-check
@@
-214,3
+223,4
@@
include rhel/automake.mk
include xenserver/automake.mk
include python/automake.mk
include python/compat/automake.mk
include xenserver/automake.mk
include python/automake.mk
include python/compat/automake.mk
+include planetlab/automake.mk