X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile.am;h=dadf84804b5fd4ef413af4f8d3eef2bef280b7cf;hb=62093bae13aa604a6e542ce327a3954d45760883;hp=e165359a80636a580080af5561ad53e3c2f822f2;hpb=4fbcabe10406118bb1856772cd7fbfb2a193869b;p=sliver-openvswitch.git

diff --git a/Makefile.am b/Makefile.am
index e165359a8..dadf84804 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 # The goal of -Wno-syntax here is just to suppress the Automake warning
 # about overriding distdir, below.
 AUTOMAKE_OPTIONS = foreign -Wno-syntax subdir-objects
-ACLOCAL_AMFLAGS = -I m4 -I ext/m4
+ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = datapath
 
 if HAVE_DPKG_BUILDPACKAGE
@@ -14,50 +14,60 @@ endif
 
 AM_CPPFLAGS = $(SSL_CFLAGS)
 AM_CPPFLAGS += -I $(top_srcdir)/include
+AM_CPPFLAGS += -I $(top_srcdir)/lib
 if HAVE_EXT
 AM_CPPFLAGS += -I $(top_srcdir)/ext/include
 endif
 
-AM_CFLAGS = -DVERSION=\"$(VERSION)\"
-AM_CFLAGS += -Wstrict-prototypes
-
-rundir = $(localstatedir)/run
-AM_CFLAGS += -DRUNDIR=\"$(rundir)\"
+AM_CFLAGS = -Wstrict-prototypes
 
 if NDEBUG
-AM_CFLAGS += -DNDEBUG -fomit-frame-pointer
+AM_CPPFLAGS += -DNDEBUG
+AM_CFLAGS += -fomit-frame-pointer
 else
 AM_LDFLAGS = -export-dynamic
 endif
 
+CLEANFILES =
 DISTCLEANFILES =
 EXTRA_DIST =
 TESTS =
 TESTS_ENVIRONMENT =
 bin_PROGRAMS =
 bin_SCRIPTS =
+dist_commands_DATA =
 dist_man_MANS =
+dist_pkgdata_SCRIPTS =
+dist_sbin_SCRIPTS =
 man_MANS =
 noinst_HEADERS =
 noinst_LIBRARIES =
 noinst_PROGRAMS =
 noinst_SCRIPTS =
 
-do_subst = sed -e 's,[@]pkidir[@],$(pkidir),g' \
-               -e 's,[@]rundir[@],$(rundir),g' \
-               -e 's,[@]PERL[@],$(PERL),g'
+EXTRA_DIST += README.hwtables subst
+
+do_subst = ($(srcdir)/subst VLOG_OPTIONS $(srcdir)/lib/vlog.man | \
+	    sed -e 's,[@]LOGDIR[@],$(LOGDIR),g' \
+		-e 's,[@]PKIDIR[@],$(PKIDIR),g' \
+                -e 's,[@]RUNDIR[@],$(RUNDIR),g' \
+                -e 's,[@]pkgdatadir[@],$(pkgdatadir),g' \
+                -e 's,[@]PERL[@],$(PERL),g')
 ro_script = sed "`printf '1a\\' && printf '\\n\# -*- buffer-read-only: t -*-'`"
-ro_man = printf '.\\" Local variables:\n.\\" buffer-read-only: t\n.\\" End:\n'
+ro_c = echo '/* -*- mode: c; buffer-read-only: t -*- */'
 
-EXTRA_DIST += README.hwtables
+SUFFIXES = .in
+.in:
+	$(do_subst) < $< > $@
 
 include lib/automake.mk
 include secchan/automake.mk
 include controller/automake.mk
 include utilities/automake.mk
 include switch/automake.mk
+include udatapath/automake.mk
 include tests/automake.mk
 include include/automake.mk
 include third-party/automake.mk
 include debian/automake.mk
-include ext/automake.mk
+include ext.mk