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
xenserver: Fix small typo in vswitch-xapi-update
[sliver-openvswitch.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index
59ffc19
..
de51e10
100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-9,7
+9,6
@@
AUTOMAKE_OPTIONS = foreign subdir-objects
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = datapath
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = datapath
-if ENABLE_USERSPACE
AM_CPPFLAGS = $(SSL_CFLAGS)
AM_CPPFLAGS += $(NCURSES_CFLAGS)
AM_CPPFLAGS += $(PCRE_CFLAGS)
AM_CPPFLAGS = $(SSL_CFLAGS)
AM_CPPFLAGS += $(NCURSES_CFLAGS)
AM_CPPFLAGS += $(PCRE_CFLAGS)
@@
-17,6
+16,7
@@
AM_CPPFLAGS += -I $(top_srcdir)/include
AM_CPPFLAGS += -I $(top_srcdir)/lib
AM_CFLAGS = -Wstrict-prototypes
AM_CPPFLAGS += -I $(top_srcdir)/lib
AM_CFLAGS = -Wstrict-prototypes
+AM_CFLAGS += $(WARNING_FLAGS)
if NDEBUG
AM_CPPFLAGS += -DNDEBUG
if NDEBUG
AM_CPPFLAGS += -DNDEBUG
@@
-27,9
+27,12
@@
endif
CLEANFILES =
DISTCLEANFILES =
CLEANFILES =
DISTCLEANFILES =
-EXTRA_DIST = INSTALL.Linux INSTALL.XenServer INSTALL.SSL
-TESTS =
-TESTS_ENVIRONMENT =
+EXTRA_DIST = INSTALL.bridge \
+ INSTALL.Linux \
+ INSTALL.userspace \
+ INSTALL.OpenFlow \
+ INSTALL.SSL \
+ INSTALL.XenServer
bin_PROGRAMS =
sbin_PROGRAMS =
bin_SCRIPTS =
bin_PROGRAMS =
sbin_PROGRAMS =
bin_SCRIPTS =
@@
-50,14
+53,25
@@
ro_c = echo '/* -*- mode: c; buffer-read-only: t -*- */'
SUFFIXES = .in
.in:
$(PERL) $(srcdir)/soexpand.pl -I$(srcdir) < $< | \
SUFFIXES = .in
.in:
$(PERL) $(srcdir)/soexpand.pl -I$(srcdir) < $< | \
- sed
-e 's,[@]LOGDIR[@],$(LOGDIR),g'
\
+ sed \
-e 's,[@]PKIDIR[@],$(PKIDIR),g' \
-e 's,[@]PKIDIR[@],$(PKIDIR),g' \
+ -e 's,[@]LOGDIR[@],$(LOGDIR),g' \
+ -e 's,[@]PERL[@],$(PERL),g' \
+ -e 's,[@]PYTHON[@],$(PYTHON),g' \
-e 's,[@]RUNDIR[@],$(RUNDIR),g' \
-e 's,[@]RUNDIR[@],$(RUNDIR),g' \
+ -e 's,[@]VERSION[@],$(VERSION),g' \
+ -e 's,[@]localstatedir[@],$(localstatedir),g' \
-e 's,[@]pkgdatadir[@],$(pkgdatadir),g' \
-e 's,[@]pkgdatadir[@],$(pkgdatadir),g' \
- -e 's,[@]PERL[@],$(PERL),g' > $@
+ -e 's,[@]sysconfdir[@],$(sysconfdir),g' \
+ > $@.tmp
+ @if head -n 1 $@.tmp | grep -q '#!'; then \
+ echo chmod +x $@.tmp; \
+ chmod +x $@.tmp; \
+ fi
+ mv $@.tmp $@
include lib/automake.mk
include lib/automake.mk
-include
secchan
/automake.mk
+include
ofproto
/automake.mk
include utilities/automake.mk
include tests/automake.mk
include include/automake.mk
include utilities/automake.mk
include tests/automake.mk
include include/automake.mk
@@
-65,9
+79,4
@@
include third-party/automake.mk
include debian/automake.mk
include vswitchd/automake.mk
include xenserver/automake.mk
include debian/automake.mk
include vswitchd/automake.mk
include xenserver/automake.mk
-if HAVE_CURSES
-if HAVE_PCRE
include extras/ezio/automake.mk
include extras/ezio/automake.mk
-endif
-endif
-endif # ENABLE_USERSPACE