X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile.am;h=889445ac51402ff207b91e8bb8855c545e73f8d5;hb=a657b914101a72a737670da8470d45c04d8b768e;hp=b1221fd9040dea70b2e37cb498b15d6dd7f9c9a6;hpb=a01f68212fc63dbb555f4f8ed59a23eddf5d3869;p=sliver-openvswitch.git

diff --git a/Makefile.am b/Makefile.am
index b1221fd90..889445ac5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,24 +18,23 @@ 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 =
 man_MANS =
 noinst_HEADERS =
@@ -43,13 +42,19 @@ 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
+
+do_subst = ($(srcdir)/subst VLOG_OPTIONS $(srcdir)/lib/vlog.man | \
+	    sed -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
@@ -60,4 +65,4 @@ include tests/automake.mk
 include include/automake.mk
 include third-party/automake.mk
 include debian/automake.mk
-include ext/automake.mk
+include ext.mk