Author: tom
Date: Mon Sep 29 09:05:35 2008
New Revision: 3008
URL: http://svn.slimdevices.com?rev=3008&root=Jive&view=rev
Log:
moved AboutJive applet to squeezeplay level
Added:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/AboutJive/ (props
changed)
- copied from r3006,
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/AboutJive/
Removed:
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/AboutJive/
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/Makefile.am
7.3/trunk/squeezeplay/src/squeezeplay/Makefile.in
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/AboutJive/AboutJiveApplet.lua
7.3/trunk/squeezeplay/src/squeezeplay_jive/Makefile.am
7.3/trunk/squeezeplay/src/squeezeplay_jive/Makefile.in
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/Makefile.am
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/Makefile.am?rev=3008&root=Jive&r1=3007&r2=3008&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/Makefile.am (original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/Makefile.am Mon Sep 29 09:05:35 2008
@@ -102,9 +102,9 @@
SqueezePlay_dmg: SqueezePlay_bundle
mkdir -p $(DMG_DIR)
/Developer/Tools/CpMac -r $(BUNDLE_NAME) ./$(DMG_DIR)/
- hdiutil create -srcfolder $(DMG_DIR) $(OSX_BUILD_DIR)/SqueezePlay.dmg
rm -rf $(DMG_DIR)
+ ##hdiutil create -srcfolder $(DMG_DIR) $(OSX_BUILD_DIR)/SqueezePlay.dmg
# Convenience library:
noinst_LTLIBRARIES = libjiveui.la libjiveaudio.la libjivenet.la
@@ -284,6 +284,11 @@
share/jive/utils/dumper.lua \
share/jive/utils/table.lua
+applets_aboutJivedir = $(datadir)/jive/applets/AboutJive
+dist_applets_aboutJive_DATA = \
+ share/applets/AboutJive/AboutJiveApplet.lua \
+ share/applets/AboutJive/AboutJiveMeta.lua \
+ share/applets/AboutJive/strings.txt
applets_logdir = $(pkgdatadir)/applets/LogSettings
dist_applets_log_DATA = \
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/Makefile.in
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/Makefile.in?rev=3008&root=Jive&r1=3007&r2=3008&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/Makefile.in (original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/Makefile.in Mon Sep 29 09:05:35 2008
@@ -40,7 +40,8 @@
host_triplet = @host@
bin_PROGRAMS = jive$(EXEEXT)
@[EMAIL PROTECTED] = jiveblit$(EXEEXT)
-DIST_COMMON = $(am__configure_deps) $(dist_applets_blankscreen_DATA) \
+DIST_COMMON = $(am__configure_deps) $(dist_applets_aboutJive_DATA) \
+ $(dist_applets_blankscreen_DATA) \
$(dist_applets_choosemusicsource_DATA) \
$(dist_applets_clock_DATA) \
$(dist_applets_customizehomemenu_DATA) \
@@ -104,6 +105,7 @@
jive_widget.lo jive_window.lo lua_jiveui.lo
libjiveui_la_OBJECTS = $(am_libjiveui_la_OBJECTS)
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(testdir)" \
+ "$(DESTDIR)$(applets_aboutJivedir)" \
"$(DESTDIR)$(applets_blankscreendir)" \
"$(DESTDIR)$(applets_choosemusicsourcedir)" \
"$(DESTDIR)$(applets_clockdir)" \
@@ -167,6 +169,7 @@
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+dist_applets_aboutJiveDATA_INSTALL = $(INSTALL_DATA)
dist_applets_blankscreenDATA_INSTALL = $(INSTALL_DATA)
dist_applets_choosemusicsourceDATA_INSTALL = $(INSTALL_DATA)
dist_applets_clockDATA_INSTALL = $(INSTALL_DATA)
@@ -203,7 +206,7 @@
dist_luanetDATA_INSTALL = $(INSTALL_DATA)
dist_luaslimDATA_INSTALL = $(INSTALL_DATA)
dist_luautilDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(dist_applets_blankscreen_DATA) \
+DATA = $(dist_applets_aboutJive_DATA) $(dist_applets_blankscreen_DATA) \
$(dist_applets_choosemusicsource_DATA) \
$(dist_applets_clock_DATA) \
$(dist_applets_customizehomemenu_DATA) \
@@ -266,7 +269,6 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -287,7 +289,6 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
-NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -300,7 +301,6 @@
SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
-SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -533,6 +533,12 @@
share/jive/utils/jsonfilters.lua \
share/jive/utils/dumper.lua \
share/jive/utils/table.lua
+
+applets_aboutJivedir = $(datadir)/jive/applets/AboutJive
+dist_applets_aboutJive_DATA = \
+ share/applets/AboutJive/AboutJiveApplet.lua \
+ share/applets/AboutJive/AboutJiveMeta.lua \
+ share/applets/AboutJive/strings.txt
applets_logdir = $(pkgdatadir)/applets/LogSettings
dist_applets_log_DATA = \
@@ -1414,6 +1420,23 @@
distclean-libtool:
-rm -f libtool
uninstall-info-am:
+install-dist_applets_aboutJiveDATA: $(dist_applets_aboutJive_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(applets_aboutJivedir)" || $(mkdir_p)
"$(DESTDIR)$(applets_aboutJivedir)"
+ @list='$(dist_applets_aboutJive_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(dist_applets_aboutJiveDATA_INSTALL) '$$d$$p'
'$(DESTDIR)$(applets_aboutJivedir)/$$f'"; \
+ $(dist_applets_aboutJiveDATA_INSTALL) "$$d$$p"
"$(DESTDIR)$(applets_aboutJivedir)/$$f"; \
+ done
+
+uninstall-dist_applets_aboutJiveDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(dist_applets_aboutJive_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(applets_aboutJivedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(applets_aboutJivedir)/$$f"; \
+ done
install-dist_applets_blankscreenDATA: $(dist_applets_blankscreen_DATA)
@$(NORMAL_INSTALL)
test -z "$(applets_blankscreendir)" || $(mkdir_p)
"$(DESTDIR)$(applets_blankscreendir)"
@@ -2078,7 +2101,7 @@
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
- $(mkdir_p) $(distdir)/config $(distdir)/share/applets/BlankScreen
$(distdir)/share/applets/ChooseMusicSource $(distdir)/share/applets/Clock
$(distdir)/share/applets/CustomizeHomeMenu $(distdir)/share/applets/DefaultSkin
$(distdir)/share/applets/DefaultSkin/images $(distdir)/share/applets/Flickr
$(distdir)/share/applets/HttpAuth $(distdir)/share/applets/InfoBrowser
$(distdir)/share/applets/LogSettings $(distdir)/share/applets/MacroPlay
$(distdir)/share/applets/NowPlaying $(distdir)/share/applets/NowPlaying/images
$(distdir)/share/applets/ScreenSavers $(distdir)/share/applets/Screenshot
$(distdir)/share/applets/SelectPlayer $(distdir)/share/applets/SelectSkin
$(distdir)/share/applets/SetupAppletInstaller
$(distdir)/share/applets/SetupDateTime $(distdir)/share/applets/SetupLanguage
$(distdir)/share/applets/SetupNetTest
$(distdir)/share/applets/SetupSoundEffects
$(distdir)/share/applets/SetupSoundEffects/sounds
$(distdir)/share/applets/SetupSqueezebox $(distdir)/share/applets/!
SetupWallpaper $(distdir)/share/applets/SetupWallpaper/wallpaper
$(distdir)/share/applets/SlimBrowser $(distdir)/share/applets/SlimDiscovery
$(distdir)/share/applets/SqueezeNetworkPIN
$(distdir)/share/applets/TestPlayback $(distdir)/share/jive
$(distdir)/share/jive/audio $(distdir)/share/jive/net
$(distdir)/share/jive/slim $(distdir)/share/jive/ui $(distdir)/share/jive/utils
$(distdir)/src
+ $(mkdir_p) $(distdir)/config $(distdir)/share/applets/AboutJive
$(distdir)/share/applets/BlankScreen $(distdir)/share/applets/ChooseMusicSource
$(distdir)/share/applets/Clock $(distdir)/share/applets/CustomizeHomeMenu
$(distdir)/share/applets/DefaultSkin
$(distdir)/share/applets/DefaultSkin/images $(distdir)/share/applets/Flickr
$(distdir)/share/applets/HttpAuth $(distdir)/share/applets/InfoBrowser
$(distdir)/share/applets/LogSettings $(distdir)/share/applets/MacroPlay
$(distdir)/share/applets/NowPlaying $(distdir)/share/applets/NowPlaying/images
$(distdir)/share/applets/ScreenSavers $(distdir)/share/applets/Screenshot
$(distdir)/share/applets/SelectPlayer $(distdir)/share/applets/SelectSkin
$(distdir)/share/applets/SetupAppletInstaller
$(distdir)/share/applets/SetupDateTime $(distdir)/share/applets/SetupLanguage
$(distdir)/share/applets/SetupNetTest
$(distdir)/share/applets/SetupSoundEffects
$(distdir)/share/applets/SetupSoundEffects/sounds
$(distdir)/share/applets/SetupS!
queezebox $(distdir)/share/applets/SetupWallpaper
$(distdir)/share/applets/SetupWallpaper/wallpaper
$(distdir)/share/applets/SlimBrowser $(distdir)/share/applets/SlimDiscovery
$(distdir)/share/applets/SqueezeNetworkPIN
$(distdir)/share/applets/TestPlayback $(distdir)/share/jive
$(distdir)/share/jive/audio $(distdir)/share/jive/net
$(distdir)/share/jive/slim $(distdir)/share/jive/ui $(distdir)/share/jive/utils
$(distdir)/src
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
@@ -2207,7 +2230,7 @@
$(MAKE) $(AM_MAKEFLAGS) check-am
all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(testdir)"
"$(DESTDIR)$(applets_blankscreendir)"
"$(DESTDIR)$(applets_choosemusicsourcedir)" "$(DESTDIR)$(applets_clockdir)"
"$(DESTDIR)$(applets_customizehomemenudir)"
"$(DESTDIR)$(applets_defaultskindir)"
"$(DESTDIR)$(applets_defaultskin_imagesdir)" "$(DESTDIR)$(applets_flickrdir)"
"$(DESTDIR)$(applets_httpauthdir)" "$(DESTDIR)$(applets_infobrowserdir)"
"$(DESTDIR)$(applets_logdir)" "$(DESTDIR)$(applets_macroplaydir)"
"$(DESTDIR)$(applets_nowplayingdir)"
"$(DESTDIR)$(applets_nowplaying_imagesdir)"
"$(DESTDIR)$(applets_screensaversdir)" "$(DESTDIR)$(applets_screenshotdir)"
"$(DESTDIR)$(applets_selectplayerdir)" "$(DESTDIR)$(applets_selectskindir)"
"$(DESTDIR)$(applets_setupSqueezeboxdir)"
"$(DESTDIR)$(applets_setupappletinstallerdir)"
"$(DESTDIR)$(applets_setupdatetimedir)" "$(DESTDIR)$(applets_setuplanguagedir)"
"$(DESTDIR)$(applets_setupnettestdir)"
"$(DESTDIR)$(applets_setupsoundeffectsdir)" "$(DESTDIR)$(applets_setupsoundef!
fects_soundsdir)" "$(DESTDIR)$(applets_setupwallpaperdir)"
"$(DESTDIR)$(applets_setupwallpaper_wallpaperdir)"
"$(DESTDIR)$(applets_slimbrowserdir)" "$(DESTDIR)$(applets_slimdiscoverydir)"
"$(DESTDIR)$(applets_squeezenetworkpindir)"
"$(DESTDIR)$(applets_testplaybackdir)" "$(DESTDIR)$(jivedir)"
"$(DESTDIR)$(jiveuidir)" "$(DESTDIR)$(luaaudiodir)" "$(DESTDIR)$(luanetdir)"
"$(DESTDIR)$(luaslimdir)" "$(DESTDIR)$(luautildir)"; do \
+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(testdir)"
"$(DESTDIR)$(applets_aboutJivedir)" "$(DESTDIR)$(applets_blankscreendir)"
"$(DESTDIR)$(applets_choosemusicsourcedir)" "$(DESTDIR)$(applets_clockdir)"
"$(DESTDIR)$(applets_customizehomemenudir)"
"$(DESTDIR)$(applets_defaultskindir)"
"$(DESTDIR)$(applets_defaultskin_imagesdir)" "$(DESTDIR)$(applets_flickrdir)"
"$(DESTDIR)$(applets_httpauthdir)" "$(DESTDIR)$(applets_infobrowserdir)"
"$(DESTDIR)$(applets_logdir)" "$(DESTDIR)$(applets_macroplaydir)"
"$(DESTDIR)$(applets_nowplayingdir)"
"$(DESTDIR)$(applets_nowplaying_imagesdir)"
"$(DESTDIR)$(applets_screensaversdir)" "$(DESTDIR)$(applets_screenshotdir)"
"$(DESTDIR)$(applets_selectplayerdir)" "$(DESTDIR)$(applets_selectskindir)"
"$(DESTDIR)$(applets_setupSqueezeboxdir)"
"$(DESTDIR)$(applets_setupappletinstallerdir)"
"$(DESTDIR)$(applets_setupdatetimedir)" "$(DESTDIR)$(applets_setuplanguagedir)"
"$(DESTDIR)$(applets_setupnettestdir)"
"$(DESTDIR)$(applets_setupsoundeffectsdir!
)" "$(DESTDIR)$(applets_setupsoundeffects_soundsdir)"
"$(DESTDIR)$(applets_setupwallpaperdir)"
"$(DESTDIR)$(applets_setupwallpaper_wallpaperdir)"
"$(DESTDIR)$(applets_slimbrowserdir)" "$(DESTDIR)$(applets_slimdiscoverydir)"
"$(DESTDIR)$(applets_squeezenetworkpindir)"
"$(DESTDIR)$(applets_testplaybackdir)" "$(DESTDIR)$(jivedir)"
"$(DESTDIR)$(jiveuidir)" "$(DESTDIR)$(luaaudiodir)" "$(DESTDIR)$(luanetdir)"
"$(DESTDIR)$(luaslimdir)" "$(DESTDIR)$(luautildir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: $(BUILT_SOURCES)
@@ -2258,7 +2281,8 @@
info-am:
-install-data-am: install-dist_applets_blankscreenDATA \
+install-data-am: install-dist_applets_aboutJiveDATA \
+ install-dist_applets_blankscreenDATA \
install-dist_applets_choosemusicsourceDATA \
install-dist_applets_clockDATA \
install-dist_applets_customizehomemenuDATA \
@@ -2321,6 +2345,7 @@
ps-am:
uninstall-am: uninstall-binPROGRAMS \
+ uninstall-dist_applets_aboutJiveDATA \
uninstall-dist_applets_blankscreenDATA \
uninstall-dist_applets_choosemusicsourceDATA \
uninstall-dist_applets_clockDATA \
@@ -2364,7 +2389,8 @@
distclean-libtool distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
install install-am install-binPROGRAMS install-data \
- install-data-am install-dist_applets_blankscreenDATA \
+ install-data-am install-dist_applets_aboutJiveDATA \
+ install-dist_applets_blankscreenDATA \
install-dist_applets_choosemusicsourceDATA \
install-dist_applets_clockDATA \
install-dist_applets_customizehomemenuDATA \
@@ -2402,7 +2428,8 @@
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
pdf pdf-am ps ps-am tags uninstall uninstall-am \
- uninstall-binPROGRAMS uninstall-dist_applets_blankscreenDATA \
+ uninstall-binPROGRAMS uninstall-dist_applets_aboutJiveDATA \
+ uninstall-dist_applets_blankscreenDATA \
uninstall-dist_applets_choosemusicsourceDATA \
uninstall-dist_applets_clockDATA \
uninstall-dist_applets_customizehomemenuDATA \
@@ -2502,7 +2529,6 @@
SqueezePlay_dmg: SqueezePlay_bundle
mkdir -p $(DMG_DIR)
/Developer/Tools/CpMac -r $(BUNDLE_NAME) ./$(DMG_DIR)/
- hdiutil create -srcfolder $(DMG_DIR) $(OSX_BUILD_DIR)/SqueezePlay.dmg
rm -rf $(DMG_DIR)
src/version.h: FORCE
Propchange: 7.3/trunk/squeezeplay/src/squeezeplay/share/applets/AboutJive/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/AboutJive/AboutJiveApplet.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/AboutJive/AboutJiveApplet.lua?rev=3008&root=Jive&r1=3006&r2=3008&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/AboutJive/AboutJiveApplet.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/AboutJive/AboutJiveApplet.lua
Mon Sep 29 09:05:35 2008
@@ -16,6 +16,9 @@
local Textarea = require("jive.ui.Textarea")
local Window = require("jive.ui.Window")
local Popup = require("jive.ui.Popup")
+local jnt = jnt
+
+local JIVE_VERSION = jive.JIVE_VERSION
local log =
require("jive.utils.log").logger("applets.setup")
@@ -26,18 +29,9 @@
function settingsShow(self)
local window = Window("window", self:string("ABOUT_JIVE"),
'settingstitle')
- local fh = io.open("/etc/squeezeos.version", "r")
- local version = fh:read("*a")
- fh:close()
+ local version = JIVE_VERSION
- local fh = io.popen("/sbin/ifconfig eth0")
- local ifconfig = fh:read("*a")
- fh:close()
-
- local hwaddr = string.match(ifconfig, "HWaddr%s+([%x:]+)")
-
- log:warn("ifconfig=", ifconfig)
- log:warn("hwaddr=", hwaddr)
+ local uuid, hwaddr = jnt:getUUID()
local about = {
tostring(self:string("ABOUT_VERSION")),
@@ -81,6 +75,7 @@
" Fred Thomas",
" Richard Titmuss",
" Julien Venetz",
+ " Tom Wadzinski",
" Osama Zaidan",
"",
"",
Modified: 7.3/trunk/squeezeplay/src/squeezeplay_jive/Makefile.am
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_jive/Makefile.am?rev=3008&root=Jive&r1=3007&r2=3008&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay_jive/Makefile.am (original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay_jive/Makefile.am Mon Sep 29 09:05:35
2008
@@ -52,13 +52,6 @@
share/applets/SetupFirmwareUpgrade/strings.txt
-applets_aboutJivedir = $(datadir)/jive/applets/AboutJive
-dist_applets_aboutJive_DATA = \
- share/applets/AboutJive/AboutJiveApplet.lua \
- share/applets/AboutJive/AboutJiveMeta.lua \
- share/applets/AboutJive/strings.txt
-
-
applets_testMotiondir = $(datadir)/jive/applets/TestMotion
dist_applets_testMotion_DATA = \
share/applets/TestMotion/TestMotionApplet.lua \
Modified: 7.3/trunk/squeezeplay/src/squeezeplay_jive/Makefile.in
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_jive/Makefile.in?rev=3008&root=Jive&r1=3007&r2=3008&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay_jive/Makefile.in (original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay_jive/Makefile.in Mon Sep 29 09:05:35
2008
@@ -41,7 +41,6 @@
$(dist_applets_SetupFactoryReset_DATA) \
$(dist_applets_SetupSSH_DATA) \
$(dist_applets_SetupWelcome_DATA) \
- $(dist_applets_aboutJive_DATA) \
$(dist_applets_setupSetupFirmwareUpgrade_DATA) \
$(dist_applets_setupWireless_DATA) \
$(dist_applets_squeezeboxjive_DATA) \
@@ -73,7 +72,6 @@
"$(DESTDIR)$(applets_SetupFactoryResetdir)" \
"$(DESTDIR)$(applets_SetupSSHdir)" \
"$(DESTDIR)$(applets_SetupWelcomedir)" \
- "$(DESTDIR)$(applets_aboutJivedir)" \
"$(DESTDIR)$(applets_setupSetupFirmwareUpgradedir)" \
"$(DESTDIR)$(applets_setupWirelessdir)" \
"$(DESTDIR)$(applets_squeezeboxjivedir)" \
@@ -111,7 +109,6 @@
dist_applets_SetupFactoryResetDATA_INSTALL = $(INSTALL_DATA)
dist_applets_SetupSSHDATA_INSTALL = $(INSTALL_DATA)
dist_applets_SetupWelcomeDATA_INSTALL = $(INSTALL_DATA)
-dist_applets_aboutJiveDATA_INSTALL = $(INSTALL_DATA)
dist_applets_setupSetupFirmwareUpgradeDATA_INSTALL = $(INSTALL_DATA)
dist_applets_setupWirelessDATA_INSTALL = $(INSTALL_DATA)
dist_applets_squeezeboxjiveDATA_INSTALL = $(INSTALL_DATA)
@@ -123,7 +120,6 @@
DATA = $(dist_applets_SetupFactoryReset_DATA) \
$(dist_applets_SetupSSH_DATA) \
$(dist_applets_SetupWelcome_DATA) \
- $(dist_applets_aboutJive_DATA) \
$(dist_applets_setupSetupFirmwareUpgrade_DATA) \
$(dist_applets_setupWireless_DATA) \
$(dist_applets_squeezeboxjive_DATA) \
@@ -285,12 +281,6 @@
share/applets/SetupFirmwareUpgrade/Upgrade.lua \
share/applets/SetupFirmwareUpgrade/strings.txt
-applets_aboutJivedir = $(datadir)/jive/applets/AboutJive
-dist_applets_aboutJive_DATA = \
- share/applets/AboutJive/AboutJiveApplet.lua \
- share/applets/AboutJive/AboutJiveMeta.lua \
- share/applets/AboutJive/strings.txt
-
applets_testMotiondir = $(datadir)/jive/applets/TestMotion
dist_applets_testMotion_DATA = \
share/applets/TestMotion/TestMotionApplet.lua \
@@ -543,23 +533,6 @@
f=$(am__strip_dir) \
echo " rm -f '$(DESTDIR)$(applets_SetupWelcomedir)/$$f'"; \
rm -f "$(DESTDIR)$(applets_SetupWelcomedir)/$$f"; \
- done
-install-dist_applets_aboutJiveDATA: $(dist_applets_aboutJive_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(applets_aboutJivedir)" || $(mkdir_p)
"$(DESTDIR)$(applets_aboutJivedir)"
- @list='$(dist_applets_aboutJive_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(dist_applets_aboutJiveDATA_INSTALL) '$$d$$p'
'$(DESTDIR)$(applets_aboutJivedir)/$$f'"; \
- $(dist_applets_aboutJiveDATA_INSTALL) "$$d$$p"
"$(DESTDIR)$(applets_aboutJivedir)/$$f"; \
- done
-
-uninstall-dist_applets_aboutJiveDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(dist_applets_aboutJive_DATA)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(applets_aboutJivedir)/$$f'"; \
- rm -f "$(DESTDIR)$(applets_aboutJivedir)/$$f"; \
done
install-dist_applets_setupSetupFirmwareUpgradeDATA:
$(dist_applets_setupSetupFirmwareUpgrade_DATA)
@$(NORMAL_INSTALL)
@@ -749,7 +722,7 @@
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
- $(mkdir_p) $(distdir)/config $(distdir)/share/applets/AboutJive
$(distdir)/share/applets/SetupFactoryReset
$(distdir)/share/applets/SetupFirmwareUpgrade $(distdir)/share/applets/SetupSSH
$(distdir)/share/applets/SetupWelcome $(distdir)/share/applets/SetupWireless
$(distdir)/share/applets/SqueezeboxJive $(distdir)/share/applets/TestDisplay
$(distdir)/share/applets/TestIR $(distdir)/share/applets/TestKeypad
$(distdir)/share/applets/TestMotion $(distdir)/share/jive/net $(distdir)/src
+ $(mkdir_p) $(distdir)/config $(distdir)/share/applets/SetupFactoryReset
$(distdir)/share/applets/SetupFirmwareUpgrade $(distdir)/share/applets/SetupSSH
$(distdir)/share/applets/SetupWelcome $(distdir)/share/applets/SetupWireless
$(distdir)/share/applets/SqueezeboxJive $(distdir)/share/applets/TestDisplay
$(distdir)/share/applets/TestIR $(distdir)/share/applets/TestKeypad
$(distdir)/share/applets/TestMotion $(distdir)/share/jive/net $(distdir)/src
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
@@ -877,7 +850,7 @@
check: check-am
all-am: Makefile $(LTLIBRARIES) $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(libdir)"
"$(DESTDIR)$(applets_SetupFactoryResetdir)" "$(DESTDIR)$(applets_SetupSSHdir)"
"$(DESTDIR)$(applets_SetupWelcomedir)" "$(DESTDIR)$(applets_aboutJivedir)"
"$(DESTDIR)$(applets_setupSetupFirmwareUpgradedir)"
"$(DESTDIR)$(applets_setupWirelessdir)"
"$(DESTDIR)$(applets_squeezeboxjivedir)" "$(DESTDIR)$(applets_testDisplaydir)"
"$(DESTDIR)$(applets_testIRdir)" "$(DESTDIR)$(applets_testKeypaddir)"
"$(DESTDIR)$(applets_testMotiondir)" "$(DESTDIR)$(jive_netdir)"; do \
+ for dir in "$(DESTDIR)$(libdir)"
"$(DESTDIR)$(applets_SetupFactoryResetdir)" "$(DESTDIR)$(applets_SetupSSHdir)"
"$(DESTDIR)$(applets_SetupWelcomedir)"
"$(DESTDIR)$(applets_setupSetupFirmwareUpgradedir)"
"$(DESTDIR)$(applets_setupWirelessdir)"
"$(DESTDIR)$(applets_squeezeboxjivedir)" "$(DESTDIR)$(applets_testDisplaydir)"
"$(DESTDIR)$(applets_testIRdir)" "$(DESTDIR)$(applets_testKeypaddir)"
"$(DESTDIR)$(applets_testMotiondir)" "$(DESTDIR)$(jive_netdir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
@@ -929,7 +902,6 @@
install-data-am: install-dist_applets_SetupFactoryResetDATA \
install-dist_applets_SetupSSHDATA \
install-dist_applets_SetupWelcomeDATA \
- install-dist_applets_aboutJiveDATA \
install-dist_applets_setupSetupFirmwareUpgradeDATA \
install-dist_applets_setupWirelessDATA \
install-dist_applets_squeezeboxjiveDATA \
@@ -969,7 +941,6 @@
uninstall-am: uninstall-dist_applets_SetupFactoryResetDATA \
uninstall-dist_applets_SetupSSHDATA \
uninstall-dist_applets_SetupWelcomeDATA \
- uninstall-dist_applets_aboutJiveDATA \
uninstall-dist_applets_setupSetupFirmwareUpgradeDATA \
uninstall-dist_applets_setupWirelessDATA \
uninstall-dist_applets_squeezeboxjiveDATA \
@@ -990,7 +961,6 @@
install-dist_applets_SetupFactoryResetDATA \
install-dist_applets_SetupSSHDATA \
install-dist_applets_SetupWelcomeDATA \
- install-dist_applets_aboutJiveDATA \
install-dist_applets_setupSetupFirmwareUpgradeDATA \
install-dist_applets_setupWirelessDATA \
install-dist_applets_squeezeboxjiveDATA \
@@ -1007,7 +977,6 @@
uninstall-dist_applets_SetupFactoryResetDATA \
uninstall-dist_applets_SetupSSHDATA \
uninstall-dist_applets_SetupWelcomeDATA \
- uninstall-dist_applets_aboutJiveDATA \
uninstall-dist_applets_setupSetupFirmwareUpgradeDATA \
uninstall-dist_applets_setupWirelessDATA \
uninstall-dist_applets_squeezeboxjiveDATA \
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
