Author: titmuss
Date: Thu Jul 17 07:08:05 2008
New Revision: 2708
URL: http://svn.slimdevices.com?rev=2708&root=Jive&view=rev
Log:
Bug: N/A
Description:
Another attempt at fixing portability of the makefile.
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/Makefile.am
7.1/trunk/squeezeplay/src/squeezeplay/Makefile.in
Modified: 7.1/trunk/squeezeplay/src/squeezeplay/Makefile.am
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/Makefile.am?rev=2708&root=Jive&r1=2707&r2=2708&view=diff
==============================================================================
--- 7.1/trunk/squeezeplay/src/squeezeplay/Makefile.am (original)
+++ 7.1/trunk/squeezeplay/src/squeezeplay/Makefile.am Thu Jul 17 07:08:05 2008
@@ -25,12 +25,14 @@
src/version.h
src/version.h: FORCE
- @echo '/* This file is automatically generated */' > src/version.h
- @echo ${ECHO_N} '#define JIVE_VERSION "'${ECHO_C} >> src/version.h
- @echo ${ECHO_N} `cat ../squeezeplay.version`${ECHO_C} >> src/version.h
- @echo ${ECHO_N} ' r'${ECHO_C} >> src/version.h
- @svnversion -n .. >> src/version.h
- @echo '"' >> src/version.h
+ echo '/* This file is automatically generated */' > src/version.h
+ echo '#ifndef SQUEEZEPLAY_RELEASE' >> src/version.h
+ echo '#define SQUEEZEPLAY_RELEASE "'`cat ../squeezeplay.version`'"' >>
src/version.h
+ echo '#endif' >> src/version.h
+ echo '#ifndef SQUEEZEPLAY_REVISION' >> src/version.h
+ echo '#define SQUEEZEPLAY_REVISION "'`svnversion -n ..`'"' >>
src/version.h
+ echo '#endif' >> src/version.h
+ echo '#define JIVE_VERSION SQUEEZEPLAY_RELEASE" r"SQUEEZEPLAY_REVISION'
>> src/version.h
FORCE:
Modified: 7.1/trunk/squeezeplay/src/squeezeplay/Makefile.in
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/Makefile.in?rev=2708&root=Jive&r1=2707&r2=2708&view=diff
==============================================================================
--- 7.1/trunk/squeezeplay/src/squeezeplay/Makefile.in (original)
+++ 7.1/trunk/squeezeplay/src/squeezeplay/Makefile.in Thu Jul 17 07:08:05 2008
@@ -2203,12 +2203,14 @@
$(TOLUA) $(TOLUAFLAGS) $(AM_TOLUAFLAGS) -n jive -o $@ $^
src/version.h: FORCE
- @echo '/* This file is automatically generated */' > src/version.h
- @echo ${ECHO_N} '#define JIVE_VERSION "'${ECHO_C} >> src/version.h
- @echo ${ECHO_N} `cat ../squeezeplay.version`${ECHO_C} >> src/version.h
- @echo ${ECHO_N} ' r'${ECHO_C} >> src/version.h
- @svnversion -n .. >> src/version.h
- @echo '"' >> src/version.h
+ echo '/* This file is automatically generated */' > src/version.h
+ echo '#ifndef SQUEEZEPLAY_RELEASE' >> src/version.h
+ echo '#define SQUEEZEPLAY_RELEASE "'`cat ../squeezeplay.version`'"' >>
src/version.h
+ echo '#endif' >> src/version.h
+ echo '#ifndef SQUEEZEPLAY_REVISION' >> src/version.h
+ echo '#define SQUEEZEPLAY_REVISION "'`svnversion -n ..`'"' >>
src/version.h
+ echo '#endif' >> src/version.h
+ echo '#define JIVE_VERSION SQUEEZEPLAY_RELEASE" r"SQUEEZEPLAY_REVISION'
>> src/version.h
FORCE:
# Tell versions [3.59,3.63) of GNU make to not export all variables.
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
