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 'mainstream'
[sliver-openvswitch.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index
adb901b
..
382f420
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,10
+10,20
@@
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
+AM_CPPFLAGS += $(PTHREAD_INCLUDES)
+AM_LDFLAGS += $(PTHREAD_LDFLAGS)
+endif
+
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
+AM_CPPFLAGS += $(SSL_INCLUDES)
+
AM_CFLAGS = -Wstrict-prototypes
AM_CFLAGS += $(WARNING_FLAGS)
AM_CFLAGS = -Wstrict-prototypes
AM_CFLAGS += $(WARNING_FLAGS)
@@
-48,14
+58,17
@@
DISTCLEANFILES =
PYCOV_CLEAN_FILES = build-aux/check-structs,cover
EXTRA_DIST = \
BUILD.Windows \
PYCOV_CLEAN_FILES = build-aux/check-structs,cover
EXTRA_DIST = \
BUILD.Windows \
+ CONTRIBUTING \
CodingStyle \
DESIGN \
FAQ \
INSTALL \
INSTALL.Debian \
CodingStyle \
DESIGN \
FAQ \
INSTALL \
INSTALL.Debian \
+ INSTALL.DPDK \
INSTALL.Fedora \
INSTALL.KVM \
INSTALL.Libvirt \
INSTALL.Fedora \
INSTALL.KVM \
INSTALL.Libvirt \
+ INSTALL.NetBSD \
INSTALL.RHEL \
INSTALL.SSL \
INSTALL.XenServer \
INSTALL.RHEL \
INSTALL.SSL \
INSTALL.XenServer \
@@
-64,11
+77,8
@@
EXTRA_DIST = \
NOTICE \
OPENFLOW-1.1+ \
PORTING \
NOTICE \
OPENFLOW-1.1+ \
PORTING \
- README-OFTest \
- README-gcov \
README-lisp \
REPORTING-BUGS \
README-lisp \
REPORTING-BUGS \
- SubmittingPatches \
WHY-OVS \
boot.sh \
build-aux/cccl \
WHY-OVS \
boot.sh \
build-aux/cccl \
@@
-93,7
+103,7
@@
MAN_FRAGMENTS =
MAN_ROOTS =
noinst_DATA =
noinst_HEADERS =
MAN_ROOTS =
noinst_DATA =
noinst_HEADERS =
-
noinst_
LIBRARIES =
+
lib_LT
LIBRARIES =
noinst_man_MANS =
noinst_PROGRAMS =
noinst_SCRIPTS =
noinst_man_MANS =
noinst_PROGRAMS =
noinst_SCRIPTS =
@@
-134,13
+144,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:
@@
-159,10
+167,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;
\
+
LC_ALL=C sort -u > all-distfiles;
\
(cd $(srcdir) && git ls-files) | grep -vFf $(srcdir)/.non-distfiles | \
(cd $(srcdir) && git ls-files) | grep -vFf $(srcdir)/.non-distfiles | \
-
sort -u > all-gitfiles;
\
-
comm -1 -3 all-distfiles all-gitfiles > missing-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; \
@@
-177,7
+185,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
@@
-257,7
+266,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
@@
-284,6
+294,7
@@
if LINUX_ENABLED
cd datapath/linux && $(MAKE) modules_install
endif
cd datapath/linux && $(MAKE) modules_install
endif
+include m4/automake.mk
include lib/automake.mk
include ofproto/automake.mk
include utilities/automake.mk
include lib/automake.mk
include ofproto/automake.mk
include utilities/automake.mk