Updated autotools scripts for distribution

Author: olivergs

.gitignore

@@ -36,6 +36,8 @@ data/fleet-commander-logger.desktop
 data/fleet-commander-admin.conf
 data/fleet-commander-admin
 data/fleet-commander-logger
+data/firefox-bookmark-fclogger
+data/firefox_bookmark_fclogger.json
 tests/data/gschemas.compiled
 fleet-commander*.tar.[gx]z
 id_rsa

admin/Makefile.am

@@ -13,7 +13,7 @@ fc_admin_py_SCRIPTS = \
 
 fc_admin_constsdir = ${fcpythondir}/fleetcommander
 fc_admin_consts_in_files = fleetcommander/constants.py.in
-fc_admin_consts_DATA = fleetcommander/constants.py
+fc_admin_consts_SCRIPTS = fleetcommander/constants.py
 
 fc_jsdir   = ${datarootdir}/cockpit/fleet-commander-admin/js
 fc_js_DATA = \
@@ -99,15 +99,15 @@ fc_css_DATA = \
 	cockpit/fleet-commander-admin/css/main.css
 
 EXTRA_DIST = \
-	     $(fc_admin_py_SCRIPTS) \
-	     $(fc_js_DATA) \
-	     $(fc_spicehtml5_DATA) \
-	     $(fc_spicehtml5thirdparty_DATA) \
-	     $(fc_cockpit_DATA) \
-	     $(fc_css_DATA) \
-			 $(fc_goaimg_DATA) \
-			 $(fc_goatelepathyimg_DATA) \
-	     $(fc_admin_consts_in_files)
+	$(fc_admin_py_SCRIPTS) \
+	$(fc_js_DATA) \
+	$(fc_spicehtml5_DATA) \
+	$(fc_spicehtml5thirdparty_DATA) \
+	$(fc_cockpit_DATA) \
+	$(fc_css_DATA) \
+	$(fc_goaimg_DATA) \
+	$(fc_goatelepathyimg_DATA) \
+	$(fc_admin_consts_in_files)
 
-CLEANFILESM = \
-	$(fc_admin_consts_DATA)
+# CLEANFILES = \
+# 	$(fc_admin_consts_SCRIPTS)

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT(fleet-commander-admin, 0.14.1, aruiz@redhat.com)
+AC_INIT(fleet-commander-admin, 0.14.2, aruiz@redhat.com)
 AC_COPYRIGHT([Copyright 2014,2015,2016,2017,2018 Red Hat, Inc.])
 
 AC_PREREQ(2.64)
@@ -67,9 +67,12 @@ databasefile='${localstatedir}'/lib/fleet-commander-admin/database.db
 fchomedir='${localstatedir}'/lib/fleet-commander
 fcadmindir='${datarootdir}'/fleet-commander-admin
 fcpythondir='${datarootdir}'/fleet-commander-admin/python
+fcloggerdir='${datarootdir}'/fleet-commander-logger
 fcloggerpythondir='${datarootdir}'/fleet-commander-logger/python
 fcconfigfile='${sysconfdir}'/xdg/fleet-commander-admin.conf
 cockpitdir='${datarootdir}'/cockpit
+mozillaextensionsdir='${datarootdir}'/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}
+nativemessagingdir='${libdir}'/mozilla/native-messaging-hosts
 
 AC_SUBST(privlibexecdir)
 AC_SUBST(xdgconfigdir)
@@ -79,8 +82,11 @@ AC_SUBST(fchomedir)
 AC_SUBST(fcadmindir)
 AC_SUBST(cockpitdir)
 AC_SUBST(fcpythondir)
+AC_SUBST(fcloggerdir)
 AC_SUBST(fcloggerpythondir)
 AC_SUBST(fcconfigfile)
+AC_SUBST(mozillaextensionsdir)
+AC_SUBST(nativemessagingdir)
 
 AS_AC_EXPAND(XDGCONFIGDIR, "$xdgconfigdir")
 AS_AC_EXPAND(PRIVLIBEXECDIR, "$privlibexecdir")
@@ -90,8 +96,12 @@ AS_AC_EXPAND(FCHOMEDIR, "$fchomedir")
 AS_AC_EXPAND(FCADMINDIR, "$fcadmindir")
 AS_AC_EXPAND(COCKPITDIR, "$cockpitdir")
 AS_AC_EXPAND(FCPYTHONDIR, "$fcpythondir")
+AS_AC_EXPAND(FCLOGGERDIR, "$fcloggerpythondir")
 AS_AC_EXPAND(FCLOGGERPYTHONDIR, "$fcloggerpythondir")
 AS_AC_EXPAND(FCCONFIGFILE, "$fcconfigfile")
+AS_AC_EXPAND(MOZILLAEXTENSIONSDIR, "$mozillaextensionsdir")
+AS_AC_EXPAND(NATIVEMESSAGINGDIR, "$nativemessagingdir")
+
 
 AC_SUBST(SYSTEMUNITDIR)
 
@@ -107,4 +117,6 @@ data/fleet-commander-admin.conf
 data/org.freedesktop.FleetCommander.service
 data/fleet-commander-admin
 data/fleet-commander-logger
+data/firefox-bookmark-fclogger
+data/firefox_bookmark_fclogger.json
 ])

data/Makefile.am

@@ -27,6 +27,14 @@ fleet_commander_logger_shellwrapperdir = ${libexecdir}
 fleet_commander_logger_shellwrapper_in_files = fleet-commander-logger.in
 fleet_commander_logger_shellwrapper_DATA = fleet-commander-logger
 
+fleet_commander_firefox_logger_shellwrapperdir = ${libexecdir}
+fleet_commander_firefox_logger_shellwrapper_in_files = firefox-bookmark-fclogger.in
+fleet_commander_firefox_logger_shellwrapper_DATA = firefox-bookmark-fclogger
+
+fleet_commander_firefox_native_manifestdir = ${nativemessagingdir}
+fleet_commander_firefox_native_manifest_in_files = firefox_bookmark_fclogger.json.in
+fleet_commander_firefox_native_manifest_DATA = firefox_bookmark_fclogger.json
+
 fleet_commander_metainfodir = ${datarootdir}/metainfo
 fleet_commander_metainfo_DATA = org.freedesktop.FleetCommander.admin.metainfo.xml
 
@@ -42,9 +50,13 @@ EXTRA_DIST = \
 	$(fleet_commander_udev_rules_DATA)             \
 	$(fleet_commander_dbus_shellwrapper_in_files)  \
 	$(fleet_commander_logger_shellwrapper_in_files)  \
+	$(fleet_commander_firefox_logger_shellwrapper_in_files)  \
+	$(fleet_commander_firefox_native_manifest_in_files)  \
 	$(fleet_commander_metainfo_DATA)               \
 	$(pixmaps_DATA)
 
 CLEANFILES = \
 	$(fleet_commander_logger_desktop_DATA)      \
-	$(fleet_commander_admin_config_DATA)
+	$(fleet_commander_admin_config_DATA) \
+	$(fleet_commander_firefox_native_manifest_DATA)
+

logger/Makefile.am

@@ -1,5 +1,12 @@
 fleet_commander_loggerdir = ${fcloggerpythondir}
-fleet_commander_logger_SCRIPTS = fleet_commander_logger.py
+fleet_commander_logger_SCRIPTS = \
+	fleet_commander_logger.py \
+	firefox_bookmark_fclogger.py
+
+fclogger_extension_firefoxdir = ${mozillaextensionsdir}
+fclogger_extension_firefox_DATA = {c73e87a7-b5a1-4b6f-b10b-0bd70241a64d}.xpi
+
 
 EXTRA_DIST = \
-	     $(fleet_commander_logger_SCRIPTS)
+		$(fleet_commander_logger_SCRIPTS) \
+		$(fclogger_extension_firefox_DATA)