Author: titmuss
Date: Wed Oct 1 10:28:10 2008
New Revision: 3041
URL: http://svn.slimdevices.com?rev=3041&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r3038): tom | 2008-10-01 16:23:35 +0100
moved makefile include file inside packages
Added:
7.4/trunk/squeezeplay/src/squeezeplay/Makefile.am.jive-install.include
(with props)
7.4/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.am.jive-install.include
(with props)
7.4/trunk/squeezeplay/src/squeezeplay_jive/Makefile.am.jive-install.include
(with props)
Removed:
7.4/trunk/squeezeplay/src/Makefile.am.jive-install.include
Modified:
7.4/trunk/ (props changed)
7.4/trunk/squeezeplay/src/squeezeplay/Makefile.am
7.4/trunk/squeezeplay/src/squeezeplay/Makefile.in
7.4/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.am
7.4/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.in
7.4/trunk/squeezeplay/src/squeezeplay_jive/Makefile.am
7.4/trunk/squeezeplay/src/squeezeplay_jive/Makefile.in
Propchange: 7.4/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Wed Oct 1 10:28:10 2008
@@ -2,7 +2,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/branches/discovery-refactor:2596
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2920
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2921
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:3033
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:3038
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/Makefile.am
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/Makefile.am?rev=3041&root=Jive&r1=3040&r2=3041&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/Makefile.am (original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/Makefile.am Wed Oct 1 10:28:10 2008
@@ -16,7 +16,7 @@
@test \! -s badsyntax
@rm -f badsyntax
-include $(top_srcdir)/../Makefile.am.jive-install.include
+include Makefile.am.jive-install.include
install-data-local: jive-static-install
##eliminate anything we still want private
Added: 7.4/trunk/squeezeplay/src/squeezeplay/Makefile.am.jive-install.include
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/Makefile.am.jive-install.include?rev=3041&root=Jive&view=auto
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/Makefile.am.jive-install.include
(added)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/Makefile.am.jive-install.include Wed
Oct 1 10:28:10 2008
@@ -1,0 +1,14 @@
+#Note: This include file is duplicated in squeezeplay/, squeezeplay_jive/, and
squeezeplay_desktop/, so
+# if you are making changes to it consider making the changes in each of the
locations.
+# The reason for the duplication (rather than a shared file) is that Poky
checks out just subdirectory not the top level
+
+JIVE_BUILD_DIR = $(PREFIX)/share/jive/
+
+#touching to try to get jive_73 build to see this file
+
+jive-static-install:
+ ##Copy selectively, currently overwrites all, not just newer
+ mkdir -p $(JIVE_BUILD_DIR)
+ cd share; tar -pcf - \
+ `find . \( -name "*.jpg" -o -name "*.gif" -o -name "*.png" -o
-name "*.wav" -o -name "*.txt" -o -name "*.lua" \)` \
+ | tar -C $(JIVE_BUILD_DIR) -pxf -
Propchange:
7.4/trunk/squeezeplay/src/squeezeplay/Makefile.am.jive-install.include
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/Makefile.in
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/Makefile.in?rev=3041&root=Jive&r1=3040&r2=3041&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/Makefile.in (original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/Makefile.in Wed Oct 1 10:28:10 2008
@@ -13,6 +13,10 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
+
+#Note: This include file is duplicated in squeezeplay/, squeezeplay_jive/, and
squeezeplay_desktop/, so
+# if you are making changes to it consider making the changes in each of the
locations.
+# The reason for the duplication (rather than a shared file) is that Poky
checks out just subdirectory not the top level
srcdir = @srcdir@
@@ -38,12 +42,11 @@
build_triplet = @build@
host_triplet = @host@
DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in \
- $(top_srcdir)/../Makefile.am.jive-install.include \
- $(top_srcdir)/configure $(top_srcdir)/src/config.h.in \
- config/config.guess config/config.sub config/depcomp \
- config/install-sh config/ltmain.sh config/missing install-sh \
- missing
+ $(srcdir)/Makefile.am.jive-install.include \
+ $(srcdir)/Makefile.in $(top_srcdir)/configure \
+ $(top_srcdir)/src/config.h.in config/config.guess \
+ config/config.sub config/depcomp config/install-sh \
+ config/ltmain.sh config/missing install-sh missing
bin_PROGRAMS = jive$(EXEEXT)
@[EMAIL PROTECTED] = jiveblit$(EXEEXT)
subdir = .
@@ -134,7 +137,6 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -155,7 +157,6 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
-NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -168,7 +169,6 @@
SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
-SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -327,7 +327,7 @@
.SUFFIXES: .pkg .c .lo .o .obj
am--refresh:
@:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am
$(top_srcdir)/../Makefile.am.jive-install.include $(am__configure_deps)
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am
$(srcdir)/Makefile.am.jive-install.include $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -851,7 +851,7 @@
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
- $(mkdir_p) $(distdir)/.. $(distdir)/config $(distdir)/src
+ $(mkdir_p) $(distdir)/config $(distdir)/src
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
@@ -1091,6 +1091,8 @@
@test \! -s badsyntax
@rm -f badsyntax
+#touching to try to get jive_73 build to see this file
+
jive-static-install:
mkdir -p $(JIVE_BUILD_DIR)
cd share; tar -pcf - \
Modified: 7.4/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.am
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.am?rev=3041&root=Jive&r1=3040&r2=3041&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.am (original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.am Wed Oct 1
10:28:10 2008
@@ -1,7 +1,7 @@
## Makefile.am -- Process this file with automake to produce Makefile.in
-include $(top_srcdir)/../Makefile.am.jive-install.include
+include Makefile.am.jive-install.include
install-data-local: jive-static-install
##eliminate anything we still want private
Added:
7.4/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.am.jive-install.include
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.am.jive-install.include?rev=3041&root=Jive&view=auto
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.am.jive-install.include
(added)
+++
7.4/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.am.jive-install.include
Wed Oct 1 10:28:10 2008
@@ -1,0 +1,14 @@
+#Note: This include file is duplicated in squeezeplay/, squeezeplay_jive/, and
squeezeplay_desktop/, so
+# if you are making changes to it consider making the changes in each of the
locations.
+# The reason for the duplication (rather than a shared file) is that Poky
checks out just subdirectory not the top level
+
+JIVE_BUILD_DIR = $(PREFIX)/share/jive/
+
+#touching to try to get jive_73 build to see this file
+
+jive-static-install:
+ ##Copy selectively, currently overwrites all, not just newer
+ mkdir -p $(JIVE_BUILD_DIR)
+ cd share; tar -pcf - \
+ `find . \( -name "*.jpg" -o -name "*.gif" -o -name "*.png" -o
-name "*.wav" -o -name "*.txt" -o -name "*.lua" \)` \
+ | tar -C $(JIVE_BUILD_DIR) -pxf -
Propchange:
7.4/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.am.jive-install.include
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: 7.4/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.in
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.in?rev=3041&root=Jive&r1=3040&r2=3041&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.in (original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.in Wed Oct 1
10:28:10 2008
@@ -13,6 +13,10 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
+
+#Note: This include file is duplicated in squeezeplay/, squeezeplay_jive/, and
squeezeplay_desktop/, so
+# if you are making changes to it consider making the changes in each of the
locations.
+# The reason for the duplication (rather than a shared file) is that Poky
checks out just subdirectory not the top level
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -36,10 +40,10 @@
build_triplet = @build@
host_triplet = @host@
DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in \
- $(top_srcdir)/../Makefile.am.jive-install.include \
- $(top_srcdir)/configure config/config.guess config/config.sub \
- config/install-sh config/missing
+ $(srcdir)/Makefile.am.jive-install.include \
+ $(srcdir)/Makefile.in $(top_srcdir)/configure \
+ config/config.guess config/config.sub config/install-sh \
+ config/missing
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.in
@@ -136,7 +140,7 @@
.SUFFIXES:
am--refresh:
@:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am
$(top_srcdir)/../Makefile.am.jive-install.include $(am__configure_deps)
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am
$(srcdir)/Makefile.am.jive-install.include $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -178,7 +182,7 @@
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
- $(mkdir_p) $(distdir)/.. $(distdir)/config
+ $(mkdir_p) $(distdir)/config
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
@@ -391,6 +395,8 @@
pdf-am ps ps-am uninstall uninstall-am uninstall-info-am
+#touching to try to get jive_73 build to see this file
+
jive-static-install:
mkdir -p $(JIVE_BUILD_DIR)
cd share; tar -pcf - \
Modified: 7.4/trunk/squeezeplay/src/squeezeplay_jive/Makefile.am
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_jive/Makefile.am?rev=3041&root=Jive&r1=3040&r2=3041&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay_jive/Makefile.am (original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay_jive/Makefile.am Wed Oct 1 10:28:10
2008
@@ -27,6 +27,6 @@
src/jive_watchdog.c
-include $(top_srcdir)/../Makefile.am.jive-install.include
+include Makefile.am.jive-install.include
install-data-local: jive-static-install
Added:
7.4/trunk/squeezeplay/src/squeezeplay_jive/Makefile.am.jive-install.include
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_jive/Makefile.am.jive-install.include?rev=3041&root=Jive&view=auto
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay_jive/Makefile.am.jive-install.include
(added)
+++ 7.4/trunk/squeezeplay/src/squeezeplay_jive/Makefile.am.jive-install.include
Wed Oct 1 10:28:10 2008
@@ -1,0 +1,14 @@
+#Note: This include file is duplicated in squeezeplay/, squeezeplay_jive/, and
squeezeplay_desktop/, so
+# if you are making changes to it consider making the changes in each of the
locations.
+# The reason for the duplication (rather than a shared file) is that Poky
checks out just subdirectory not the top level
+
+JIVE_BUILD_DIR = $(PREFIX)/share/jive/
+
+#touching to try to get jive_73 build to see this file
+
+jive-static-install:
+ ##Copy selectively, currently overwrites all, not just newer
+ mkdir -p $(JIVE_BUILD_DIR)
+ cd share; tar -pcf - \
+ `find . \( -name "*.jpg" -o -name "*.gif" -o -name "*.png" -o
-name "*.wav" -o -name "*.txt" -o -name "*.lua" \)` \
+ | tar -C $(JIVE_BUILD_DIR) -pxf -
Propchange:
7.4/trunk/squeezeplay/src/squeezeplay_jive/Makefile.am.jive-install.include
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: 7.4/trunk/squeezeplay/src/squeezeplay_jive/Makefile.in
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_jive/Makefile.in?rev=3041&root=Jive&r1=3040&r2=3041&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay_jive/Makefile.in (original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay_jive/Makefile.in Wed Oct 1 10:28:10
2008
@@ -13,6 +13,10 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
+
+#Note: This include file is duplicated in squeezeplay/, squeezeplay_jive/, and
squeezeplay_desktop/, so
+# if you are making changes to it consider making the changes in each of the
locations.
+# The reason for the duplication (rather than a shared file) is that Poky
checks out just subdirectory not the top level
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -37,11 +41,11 @@
build_triplet = @build@
host_triplet = @host@
DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in \
- $(top_srcdir)/../Makefile.am.jive-install.include \
- $(top_srcdir)/configure $(top_srcdir)/src/config.h.in \
- config/config.guess config/config.sub config/depcomp \
- config/install-sh config/ltmain.sh config/missing
+ $(srcdir)/Makefile.am.jive-install.include \
+ $(srcdir)/Makefile.in $(top_srcdir)/configure \
+ $(top_srcdir)/src/config.h.in config/config.guess \
+ config/config.sub config/depcomp config/install-sh \
+ config/ltmain.sh config/missing
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -225,7 +229,7 @@
.SUFFIXES: .c .lo .o .obj
am--refresh:
@:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am
$(top_srcdir)/../Makefile.am.jive-install.include $(am__configure_deps)
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am
$(srcdir)/Makefile.am.jive-install.include $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -428,7 +432,7 @@
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
- $(mkdir_p) $(distdir)/.. $(distdir)/config $(distdir)/src
+ $(mkdir_p) $(distdir)/config $(distdir)/src
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
@@ -660,6 +664,8 @@
@test \! -s badsyntax
@rm -f badsyntax
+#touching to try to get jive_73 build to see this file
+
jive-static-install:
mkdir -p $(JIVE_BUILD_DIR)
cd share; tar -pcf - \
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
