X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.am;h=115162de53daff510bce0ef0dcf9baf0b6411f8e;hb=refs%2Fheads%2Fof1.1;hp=3cd56de169f9aa08ff0364361328b2c5b91a92d1;hpb=6c88547dd0f75a29e6d1c0cd3c76d9678fa4752f;p=openvswitch

diff --git a/Makefile.am b/Makefile.am
index 3cd56de1..115162de 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009, 2010, 2011 Nicira Networks, Inc.
+# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Nicira, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
@@ -20,25 +20,37 @@ AM_CFLAGS += $(WARNING_FLAGS)
 if NDEBUG
 AM_CPPFLAGS += -DNDEBUG
 AM_CFLAGS += -fomit-frame-pointer
-else
-AM_LDFLAGS = -export-dynamic
 endif
 
+# PYTHONDONTWRITEBYTECODE=yes keeps Python from creating .pyc and .pyo
+# files.  Creating .py[co] works OK for any given version of Open
+# vSwitch, but it causes trouble if you switch from a version with
+# foo/__init__.py into an (older) version with plain foo.py, since
+# foo/__init__.pyc will cause Python to ignore foo.py.
+run_python = \
+	PYTHONDONTWRITEBYTECODE=yes \
+	PYTHONPATH=$(top_srcdir)/python:$$PYTHONPATH \
+	$(PYTHON)
+
 ALL_LOCAL =
 BUILT_SOURCES =
 CLEANFILES =
 CLEAN_LOCAL =
 DISTCLEANFILES =
+PYCOV_CLEAN_FILES = build-aux/check-structs,cover
 EXTRA_DIST = \
 	CodingStyle \
 	DESIGN \
+	FAQ \
 	INSTALL.KVM \
+	INSTALL.Libvirt \
 	INSTALL.Linux \
 	INSTALL.RHEL \
 	INSTALL.SSL \
 	INSTALL.XenServer \
 	INSTALL.bridge \
 	INSTALL.userspace \
+	IntegrationGuide \
 	NOTICE \
 	PORTING \
 	README-gcov \
@@ -46,7 +58,10 @@ EXTRA_DIST = \
 	SubmittingPatches \
 	WHY-OVS \
 	boot.sh \
-	$(MAN_FRAGMENTS)
+	build-aux/sodepends.pl \
+	build-aux/soexpand.pl \
+	$(MAN_FRAGMENTS) \
+	$(MAN_ROOTS)
 bin_PROGRAMS =
 sbin_PROGRAMS =
 bin_SCRIPTS =
@@ -56,10 +71,12 @@ dist_pkgdata_DATA =
 dist_pkgdata_SCRIPTS =
 dist_sbin_SCRIPTS =
 dist_scripts_SCRIPTS =
+dist_scripts_DATA =
 INSTALL_DATA_LOCAL =
 UNINSTALL_LOCAL =
 man_MANS =
 MAN_FRAGMENTS =
+MAN_ROOTS =
 noinst_DATA =
 noinst_HEADERS =
 noinst_LIBRARIES =
@@ -70,6 +87,7 @@ OVSIDL_BUILT =
 pkgdata_DATA =
 sbin_SCRIPTS =
 scripts_SCRIPTS =
+scripts_DATA =
 SUFFIXES =
 check_DATA =
 
@@ -81,15 +99,12 @@ scriptsdir = $(pkgdatadir)/scripts
 # http://article.gmane.org/gmane.comp.sysutils.automake.general/10891
 noinst_HEADERS += $(EXTRA_DIST)
 
-EXTRA_DIST += \
-	soexpand.pl
-
 ro_c = echo '/* -*- mode: c; buffer-read-only: t -*- */'
 ro_shell = printf '\043 Generated automatically -- do not modify!    -*- buffer-read-only: t -*-\n'
 
 SUFFIXES += .in
 .in:
-	$(PERL) $(srcdir)/soexpand.pl -I$(srcdir) < $< | \
+	$(PERL) $(srcdir)/build-aux/soexpand.pl -I$(srcdir) < $< | \
 	    sed \
 		-e 's,[@]PKIDIR[@],$(PKIDIR),g' \
                 -e 's,[@]LOGDIR[@],$(LOGDIR),g' \
@@ -97,7 +112,6 @@ SUFFIXES += .in
                 -e 's,[@]PYTHON[@],$(PYTHON),g' \
                 -e 's,[@]RUNDIR[@],$(RUNDIR),g' \
                 -e 's,[@]VERSION[@],$(VERSION),g' \
-                -e 's,[@]BUILDNR[@],$(BUILDNR),g' \
                 -e 's,[@]localstatedir[@],$(localstatedir),g' \
                 -e 's,[@]pkgdatadir[@],$(pkgdatadir),g' \
                 -e 's,[@]sysconfdir[@],$(sysconfdir),g' \
@@ -112,6 +126,11 @@ SUFFIXES += .in
 	fi
 	mv $@.tmp $@
 
+.PHONY: clean-pycov
+clean-pycov:
+	cd $(srcdir) && rm -f $(PYCOV_CLEAN_FILES)
+CLEAN_LOCAL += clean-pycov
+
 # If we're checked out from a Git repository, make sure that every
 # file that is in Git is distributed.
 ALL_LOCAL += dist-hook-git
@@ -153,15 +172,28 @@ rate-limit-check:
 
 if HAVE_GROFF
 ALL_LOCAL += manpage-check
-manpage-check: $(MANS) $(MAN_FRAGMENTS)
-	@manpages=; \
-	for d in $(MANS); do \
-		manpages="$$manpages `test -f $$d || echo $(VPATH)/`$$d"; \
+manpage-check: $(man_MANS) $(dist_man_MANS) $(noinst_man_MANS)
+	@error=false; \
+	for manpage in $?; do \
+		LANG=en_US.UTF-8 groff -w mac -w delim -w escape -w input -w missing -w tab -T utf8 -man -p -z $$manpage >$@.tmp 2>&1; \
+		if grep warning: $@.tmp; then error=:; fi; \
+		rm -f $@.tmp; \
 	done; \
-	LANG=en_US.UTF-8 groff -w mac -w delim -w escape -w input -w missing -w tab -T ascii -man -p -z $$manpages && touch $@
+	if $$error; then exit 1; else echo touch $@; touch $@; fi
 CLEANFILES += manpage-check
 endif
 
+include $(srcdir)/manpages.mk
+$(srcdir)/manpages.mk: $(MAN_ROOTS) build-aux/sodepends.pl
+	@$(PERL) $(srcdir)/build-aux/sodepends.pl -I. -I$(srcdir) $(MAN_ROOTS) >$(@F).tmp
+	@if cmp -s $(@F).tmp $@; then \
+		touch $@; \
+		rm -f $(@F).tmp; \
+	else \
+		mv $(@F).tmp $@; \
+	fi
+CLEANFILES += manpage-dep-check
+
 dist-hook: $(DIST_HOOKS)
 all-local: $(ALL_LOCAL)
 clean-local: $(CLEAN_LOCAL)
@@ -180,5 +212,5 @@ include vswitchd/automake.mk
 include ovsdb/automake.mk
 include rhel/automake.mk
 include xenserver/automake.mk
-include python/ovs/automake.mk
+include python/automake.mk
 include python/compat/automake.mk