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 commit '10a89ef04df5669c5cdd02f786150a7ab8454e01'
[sliver-openvswitch.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index
328b248
..
eed5a74
100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-1,4
+1,4
@@
-# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Nicira, Inc.
+# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012
, 2013
Nicira, Inc.
#
# Copying and distribution of this file, with or without modification,
# are permitted in any medium without royalty provided the copyright
#
# Copying and distribution of this file, with or without modification,
# are permitted in any medium without royalty provided the copyright
@@
-55,7
+55,9
@@
EXTRA_DIST = \
NOTICE \
OPENFLOW-1.1+ \
PORTING \
NOTICE \
OPENFLOW-1.1+ \
PORTING \
+ README-OFTest \
README-gcov \
README-gcov \
+ README-lisp \
REPORTING-BUGS \
SubmittingPatches \
WHY-OVS \
REPORTING-BUGS \
SubmittingPatches \
WHY-OVS \
@@
-106,6
+108,7
@@
ro_shell = printf '\043 Generated automatically -- do not modify! -*- buffer-
SUFFIXES += .in
.in:
SUFFIXES += .in
.in:
+ @mkdir -p $$(dirname $@)
$(PERL) $(srcdir)/build-aux/soexpand.pl -I$(srcdir) < $< | \
sed \
-e 's,[@]PKIDIR[@],$(PKIDIR),g' \
$(PERL) $(srcdir)/build-aux/soexpand.pl -I$(srcdir) < $< | \
sed \
-e 's,[@]PKIDIR[@],$(PKIDIR),g' \
@@
-147,7
+150,7
@@
dist-hook-git: distfiles
(cd datapath && $(MAKE) distfiles); \
(cat distfiles; sed 's|^|datapath/|' datapath/distfiles) | \
sort -u > all-distfiles; \
(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 \
@@
-183,17
+186,17
@@
config-h-check:
fi
.PHONY: config-h-check
fi
.PHONY: config-h-check
-# Check that
"struct vlog_ratelimit" is
always declared "static".
-ALL_LOCAL +=
rate-limit
-check
-
rate-limit
-check:
+# Check that
certain data structures are
always declared "static".
+ALL_LOCAL +=
static
-check
+
static
-check:
@if test -e $(srcdir)/.git && (git --version) >/dev/null 2>&1 && \
@if test -e $(srcdir)/.git && (git --version) >/dev/null 2>&1 && \
- git --no-pager grep -n -E '^[ ]+
struct vlog_rate_limit
.*=' $(srcdir); \
+ git --no-pager grep -n -E '^[ ]+
(struct vlog_rate_limit|pthread_once_t|struct ovsthread_once)
.*=' $(srcdir); \
then \
echo "See above for list of violations of the rule that "; \
then \
echo "See above for list of violations of the rule that "; \
- echo "
'struct vlog_rate_limit'
must always be 'static'"; \
+ echo "
certain data structures
must always be 'static'"; \
exit 1; \
fi
exit 1; \
fi
-.PHONY:
rate-limit
-check
+.PHONY:
static
-check
# Check that assert.h is not used outside a whitelist of files.
ALL_LOCAL += check-assert-h-usage
# Check that assert.h is not used outside a whitelist of files.
ALL_LOCAL += check-assert-h-usage
@@
-257,3
+260,5
@@
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
+include tutorial/automake.mk