ofproto: Add more thread safety annotations.

[cascardo/ovs.git] / ovsdb / ovsdbmonitor / automake.mk

diff --git a/ovsdb/ovsdbmonitor/automake.mk b/ovsdb/ovsdbmonitor/automake.mk
index 5d1f960..14da10b 100644 (file)
--- a/ovsdb/ovsdbmonitor/automake.mk
+++ b/ovsdb/ovsdbmonitor/automake.mk
@@ -25,18 +25,31 @@ EXTRA_DIST += \
        ovsdb/ovsdbmonitor/HostWindow.ui \
        ovsdb/ovsdbmonitor/LogWindow.ui \
        ovsdb/ovsdbmonitor/MainWindow.ui \
-       ovsdb/ovsdbmonitor/ovsdbmonitor.in
+       ovsdb/ovsdbmonitor/ovsdbmonitor.in \
+       ovsdb/ovsdbmonitor/ovsdbmonitor.desktop
+MAN_ROOTS += ovsdb/ovsdbmonitor/ovsdbmonitor.1
 
-ovsdbmonitordir = ${pkgdatadir}/ovsdbmonitor
+ovsdbmonitordir = ${datadir}/ovsdbmonitor
+desktopdir = ${datadir}/applications
 if BUILD_OVSDBMONITOR
 noinst_SCRIPTS += ovsdb/ovsdbmonitor/ovsdbmonitor
 ovsdbmonitor_DATA = $(ovsdbmonitor_pyfiles)
-install-exec-local:
-       sed -e '/NOINSTALL/d' < ovsdb/ovsdbmonitor/ovsdbmonitor > ovsdbmonitor.tmp
-       chmod +x ovsdbmonitor.tmp
-       $(INSTALL_PROGRAM) ovsdbmonitor.tmp $(DESTDIR)$(bindir)/ovsdbmonitor
+desktop_DATA = ovsdb/ovsdbmonitor/ovsdbmonitor.desktop
+install-exec-hook:
+       sed -e '/NOINSTALL/d' < ovsdb/ovsdbmonitor/ovsdbmonitor > ovsdb/ovsdbmonitor/ovsdbmonitor.tmp
+       chmod +x ovsdb/ovsdbmonitor/ovsdbmonitor.tmp
+       $(INSTALL_PROGRAM) ovsdb/ovsdbmonitor/ovsdbmonitor.tmp $(DESTDIR)$(bindir)/ovsdbmonitor
+       rm ovsdb/ovsdbmonitor/ovsdbmonitor.tmp
+DISTCLEANFILES += \
+       ovsdb/ovsdbmonitor/ovsdbmonitor \
+       ovsdb/ovsdbmonitor/ovsdbmonitor.tmp
+man_MANS += ovsdb/ovsdbmonitor/ovsdbmonitor.1
 endif
 
+UNINSTALL_LOCAL += ovsdbmonitor-uninstall-local
+ovsdbmonitor-uninstall-local:
+       rm -f $(DESTDIR)$(bindir)/ovsdbmonitor
+
 SUFFIXES += .ui .py
 .ui.py:
        $(PYUIC4) $< | sed 's/from PyQt4 import QtCore, QtGui/\