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
tunnel: removed unused function
[sliver-openvswitch.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index
6acb0a6
..
8e87557
100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-1,4
+1,4
@@
-# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
+# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013
, 2014
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
@@
-10,11
+10,14
@@
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = datapath
AM_CPPFLAGS = $(SSL_CFLAGS)
SUBDIRS = datapath
AM_CPPFLAGS = $(SSL_CFLAGS)
+AM_LDFLAGS = $(SSL_LDFLAGS)
if WIN32
AM_CPPFLAGS += -I $(top_srcdir)/include/windows
endif
if WIN32
AM_CPPFLAGS += -I $(top_srcdir)/include/windows
endif
+AM_CPPFLAGS += $(SSL_INCLUDES)
+
AM_CPPFLAGS += -I $(top_srcdir)/include
AM_CPPFLAGS += -I $(top_srcdir)/lib
AM_CPPFLAGS += -I $(top_builddir)/lib
AM_CPPFLAGS += -I $(top_srcdir)/include
AM_CPPFLAGS += -I $(top_srcdir)/lib
AM_CPPFLAGS += -I $(top_builddir)/lib
@@
-124,6
+127,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' \
@@
-139,13
+143,11
@@
SUFFIXES += .in
-e 's,[@]bindir[@],$(bindir),g' \
-e 's,[@]sbindir[@],$(sbindir),g' \
-e 's,[@]abs_top_srcdir[@],$(abs_top_srcdir),g' \
-e 's,[@]bindir[@],$(bindir),g' \
-e 's,[@]sbindir[@],$(sbindir),g' \
-e 's,[@]abs_top_srcdir[@],$(abs_top_srcdir),g' \
- -e 's,[@]ovsdbmonitordir[@],$(ovsdbmonitordir),g' \
> $@.tmp
@if head -n 1 $@.tmp | grep '#!' > /dev/null; then \
> $@.tmp
@if head -n 1 $@.tmp | grep '#!' > /dev/null; then \
- echo chmod +x $@.tmp; \
chmod +x $@.tmp; \
fi
chmod +x $@.tmp; \
fi
- mv $@.tmp $@
+
$(AM_V_GEN)
mv $@.tmp $@
.PHONY: clean-pycov
clean-pycov:
.PHONY: clean-pycov
clean-pycov:
@@
-164,10
+166,10
@@
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) | \
@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$$' |
\
-
sort -u > all-gitfiles;
\
-
comm -1 -3 all-distfiles all-gitfiles > missing-distfiles;
\
+
LC_ALL=C sort -u > all-distfiles;
\
+ (cd $(srcdir) && git ls-files) | grep -v
Ff $(srcdir)/.non-distfiles |
\
+
LC_ALL=C sort -u > all-gitfiles;
\
+
LC_ALL=C comm -1 -3 all-distfiles all-gitfiles > missing-distfiles;
\
if test -s missing-distfiles; then \
echo "The distribution is missing the following files:"; \
cat missing-distfiles; \
if test -s missing-distfiles; then \
echo "The distribution is missing the following files:"; \
cat missing-distfiles; \
@@
-182,7
+184,8
@@
distfiles: Makefile
list='$(DISTFILES)'; \
for file in $$list; do echo $$file; done | \
sed -e "s|^$$srcdirstrip/||;t" \
list='$(DISTFILES)'; \
for file in $$list; do echo $$file; done | \
sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t" | sort -u > $@
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t" | \
+ LC_ALL=C sort -u > $@
CLEANFILES += distfiles
endif
.PHONY: dist-hook-git
CLEANFILES += distfiles
endif
.PHONY: dist-hook-git
@@
-262,7
+265,8
@@
manpage-check: $(man_MANS) $(dist_man_MANS) $(noinst_man_MANS)
if grep warning: $@.tmp; then error=:; fi; \
rm -f $@.tmp; \
done; \
if grep warning: $@.tmp; then error=:; fi; \
rm -f $@.tmp; \
done; \
- if $$error; then exit 1; else echo touch $@; touch $@; fi
+ if $$error; then exit 1; else touch $@; fi
+ $(AM_V_GEN) touch -c $@
CLEANFILES += manpage-check
endif
CLEANFILES += manpage-check
endif
@@
-303,5
+307,6
@@
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
include vtep/automake.mk
include tutorial/automake.mk
include vtep/automake.mk