projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
byteq: Move from extras/ezio into lib and export some private functions.
[openvswitch]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 1b40cdea9a3275ebff37603b2da86ec367fb220c..52f5e594a51761c87487df7d8c8b933932174b36 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)
@@
-31,9
+30,8
@@
EXTRA_DIST = INSTALL.bridge \
INSTALL.Linux \
INSTALL.OpenFlow \
INSTALL.SSL \
INSTALL.Linux \
INSTALL.OpenFlow \
INSTALL.SSL \
- INSTALL.XenServer
-TESTS =
-TESTS_ENVIRONMENT =
+ INSTALL.XenServer \
+ README-gcov
bin_PROGRAMS =
sbin_PROGRAMS =
bin_SCRIPTS =
bin_PROGRAMS =
sbin_PROGRAMS =
bin_SCRIPTS =
@@
-54,11
+52,22
@@
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 ofproto/automake.mk
include lib/automake.mk
include ofproto/automake.mk
@@
-69,9
+78,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