Package: openscenegraph
Version: 0.9.9-7
Severity: normal
Tags: patch
Hi,
Attached is the diff for my openscenegraph 0.9.9-7.1 NMU.
--
Homepage: http://www.sesse.net/
diff -u openscenegraph-0.9.9/debian/changelog
openscenegraph-0.9.9/debian/changelog
--- openscenegraph-0.9.9/debian/changelog
+++ openscenegraph-0.9.9/debian/changelog
@@ -1,3 +1,13 @@
+openscenegraph (0.9.9-7.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Replace build-dependency on xlibs-dev with an explicit build-dependency
+ on each required package. (Closes: #347105)
+ * Add whitespace at the appropriate places in the build scripts, to satisfy
+ newer, stricter versions of GNU Make. (Closes: #349218)
+
+ -- Steinar H. Gunderson <[EMAIL PROTECTED]> Sat, 21 Jan 2006 17:28:48 +0100
+
openscenegraph (0.9.9-7) unstable; urgency=low
* conflicts with libopenthreads, libopenscenegraph and libproducer (closes:
#326425)
diff -u openscenegraph-0.9.9/debian/control openscenegraph-0.9.9/debian/control
--- openscenegraph-0.9.9/debian/control
+++ openscenegraph-0.9.9/debian/control
@@ -2,7 +2,7 @@
Section: devel
Priority: optional
Maintainer: Loic Dachary (OuoU) <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0), libungif4-dev | giflib-dev, libjpeg-dev,
libtiff-dev, libxine-dev, libgdal-dev, lib3ds-dev, libfreetype6-dev,
libpng12-dev, libcoin40-dev, libjasper-dev, libglut-dev, ccache, xlibs-dev,
xlibmesa-gl-dev, xlibmesa-glu-dev, doxygen
+Build-Depends: debhelper (>= 4.0.0), libungif4-dev | giflib-dev, libjpeg-dev,
libtiff-dev, libxine-dev, libgdal-dev, lib3ds-dev, libfreetype6-dev,
libpng12-dev, libcoin40-dev, libjasper-dev, libglut-dev, ccache, libx11-dev,
libxmu-dev, libxt-dev, x-dev, xlibmesa-gl-dev, xlibmesa-glu-dev, doxygen
Standards-Version: 3.6.2.1
Package: libopenthreads-dev
only in patch2:
unchanged:
--- openscenegraph-0.9.9.orig/OpenThreads/Make/makeinnosetup
+++ openscenegraph-0.9.9/OpenThreads/Make/makeinnosetup
@@ -43,7 +43,7 @@
{
DIR=$1
FILE=$2
- printf "Source: \"%s\\\%s\"; DestDir: \"{app}\\\%s\\\"; Flags:
ignoreversion\n"\
+ printf "Source: \"%s\\\%s\"; DestDir: \"{app}\\\%s\\\"; Flags:
ignoreversion\n" \
$DIR $FILE $DIR
}
@@ -57,7 +57,7 @@
DOS_SRC=`echo $src | sed 's/\\//\\\/g'`
DOS_DST=`echo $dst | sed 's/\\//\\\/g'`
- printf "Source: \"%s\"; DestDir: \"{app}\\\%s\\\"; Flags:
ignoreversion\n"\
+ printf "Source: \"%s\"; DestDir: \"{app}\\\%s\\\"; Flags:
ignoreversion\n" \
$DOS_SRC $DOS_DST
done
}
only in patch2:
unchanged:
--- openscenegraph-0.9.9.orig/OpenThreads/Make/makerules
+++ openscenegraph-0.9.9/OpenThreads/Make/makerules
@@ -130,10 +130,10 @@
@if [ ! -d .depend ] ; then \
mkdir .depend;\
depfiles="$+";\
- else\
+ else \
depfiles="$?";\
fi;\
- if [ ! -z "$$depfiles" ]; then\
+ if [ ! -z "$$depfiles" ]; then \
for f in $$depfiles; do \
echo "$(CXX) $(DEPARG) $(INC) $$f pipeto .depend/`basename $$f`"; \
$(CXX) $(DEPARG) $(INC) $$f > .depend/`basename $$f`; \
only in patch2:
unchanged:
--- openscenegraph-0.9.9.orig/OpenThreads/Make/versionrules
+++ openscenegraph-0.9.9/OpenThreads/Make/versionrules
@@ -13,9 +13,9 @@
## 'make version' will print the version with a
#######################################################################
version :
- @if [ "$(VERSION_REVISION)" = "0" ]; then\
+ @if [ "$(VERSION_REVISION)" = "0" ]; then \
release=`date +%Y%m%d%H%M`;\
- else\
+ else \
release=$(VERSION_REVISION);\
fi;\
echo $(VERSION)-$$release;
only in patch2:
unchanged:
--- openscenegraph-0.9.9.orig/OpenThreads/Make/makepkg
+++ openscenegraph-0.9.9/OpenThreads/Make/makepkg
@@ -136,11 +136,11 @@
PKGSUBDIR=dist/PKG
-make_package\
+make_package \
"OpenSceneGraph" \
- "Open Scene Graph - Run-time environment"\
- "An OpenGL based scene graph. This installation includes a set of
run-time libraries, and demo programs"\
- $INST_LIBS $INST_PLUGINS $INST_DEMOS\
+ "Open Scene Graph - Run-time environment" \
+ "An OpenGL based scene graph. This installation includes a set of
run-time libraries, and demo programs" \
+ $INST_LIBS $INST_PLUGINS $INST_DEMOS \
make_installable "OpenSceneGraph"
@@ -176,10 +176,10 @@
[ -d $dd ] && INSTARG="$INSTARG $dd"
-make_package\
- "OpenSceneGraph-dev"\
- "Open Scene Graph - Development environment"\
- "An OpenGL based scene graph. This installation includes header files
and demo program source files"\
+make_package \
+ "OpenSceneGraph-dev" \
+ "Open Scene Graph - Development environment" \
+ "An OpenGL based scene graph. This installation includes header files
and demo program source files" \
$INSTARG
make_installable "OpenSceneGraph-dev"
only in patch2:
unchanged:
--- openscenegraph-0.9.9.orig/OpenThreads/Make/helprules
+++ openscenegraph-0.9.9/OpenThreads/Make/helprules
@@ -1,11 +1,11 @@
help:
- $(TOPDIR)/Make/help.sh\
- $(OS)\
- $(TOPDIR)\
- $(INST_LIBS)\
- $(INST_PLUGINS)\
- $(INST_INCLUDE)\
- $(INST_DEMOS)\
- $(INST_DEMO_SRC)\
- $(INST_DOC)\
+ $(TOPDIR)/Make/help.sh \
+ $(OS) \
+ $(TOPDIR) \
+ $(INST_LIBS) \
+ $(INST_PLUGINS) \
+ $(INST_INCLUDE)\
+ $(INST_DEMOS) \
+ $(INST_DEMO_SRC) \
+ $(INST_DOC) \
$(INST_DATA) | more
only in patch2:
unchanged:
--- openscenegraph-0.9.9.orig/OpenThreads/Make/instrules
+++ openscenegraph-0.9.9/OpenThreads/Make/instrules
@@ -22,9 +22,9 @@
__inst_headers:
@[ -d $(INST_INCLUDE)/OpenThreads ] || mkdir -p
$(INST_INCLUDE)/OpenThreads
- for f in include/OpenThreads/* ; do\
+ for f in include/OpenThreads/* ; do \
if ! [ -d $$f ];\
- then\
+ then \
[ "`head -1 $$f | cut -c 1-12`" = "/* -*-c++-*-" ] && \
echo $(INSTRCMD) $$f $(INST_INCLUDE)/OpenThreads; \
$(INSTRCMD) $$f $(INST_INCLUDE)/OpenThreads; \
@@ -33,10 +33,10 @@
__inst_share:
- @for d in `find share/ -type d -print | grep -v CVS`; do\
+ @for d in `find share/ -type d -print | grep -v CVS`; do \
[ -d $(INST_LOCATION)/$$d ] || mkdir -p $(INST_LOCATION)/$$d;\
done
- @for f in `find share/ -type f -print | grep -v CVS`; do\
+ @for f in `find share/ -type f -print | grep -v CVS`; do \
$(INSTRCMD) $$f $(INST_LOCATION)/$$f;\
done
only in patch2:
unchanged:
--- openscenegraph-0.9.9.orig/Producer/Make/makerules
+++ openscenegraph-0.9.9/Producer/Make/makerules
@@ -115,10 +115,10 @@
@if [ ! -d .depend ] ; then \
mkdir .depend;\
depfiles="$+";\
- else\
+ else \
depfiles="$?";\
fi;\
- if [ ! -z "$$depfiles" ]; then\
+ if [ ! -z "$$depfiles" ]; then \
for f in $$depfiles; do \
echo "$(CXX) $(DEPARG) $(INC) $(DEF) $$f redirectto
.depend/`basename $$f`"; \
$(CXX) $(DEPARG) $(INC) $(DEF) $$f > .depend/`basename $$f`; \
only in patch2:
unchanged:
--- openscenegraph-0.9.9.orig/Producer/Make/versionrules
+++ openscenegraph-0.9.9/Producer/Make/versionrules
@@ -13,17 +13,17 @@
## 'make version' will print the version with a
#######################################################################
verbose_version :
- @if [ "$(VERSION_REVISION)" = "0" ]; then\
+ @if [ "$(VERSION_REVISION)" = "0" ]; then \
revision=`date +%Y%m%d%H%M`;\
- else\
+ else \
revision=$(VERSION_REVISION);\
fi;\
echo
"Producer_"$(VERSION_MAJOR)"_"$(VERSION_MINOR)"_"$(VERSION_RELEASE)"_release_revision_"$$revision
version :
- @if [ "$(VERSION_REVISION)" = "0" ]; then\
+ @if [ "$(VERSION_REVISION)" = "0" ]; then \
revision=`date +%Y%m%d%H%M`;\
- else\
+ else \
revision=$(VERSION_REVISION);\
fi;\
echo $(VERSION)-$$revision;
only in patch2:
unchanged:
--- openscenegraph-0.9.9.orig/Producer/Make/makepkg
+++ openscenegraph-0.9.9/Producer/Make/makepkg
@@ -134,10 +134,10 @@
PKGSUBDIR=dist/PKG
-make_package\
- "Producer"\
- "Producer - Run time and development environment"\
- "An OpenGL based library for viewpoint management and parallel
rendering"\
+make_package \
+ "Producer" \
+ "Producer - Run time and development environment" \
+ "An OpenGL based library for viewpoint management and parallel
rendering" \
$INST_LIBS $INST_INCLUDE"/Producer"
make_installable "Producer"
only in patch2:
unchanged:
--- openscenegraph-0.9.9.orig/Producer/Make/tabrules
+++ openscenegraph-0.9.9/Producer/Make/tabrules
@@ -3,7 +3,7 @@
[ "`head -c 21 $$f`" = "/* -*-c++-*- header -" ] && echo $$f; done };\
fs() { for f in `find src -type f -print` ; do \
[ "`head -c 21 $$f`" = "/* -*-c++-*- source -" ] && echo $$f; done };\
- for ff in `fh` `fs`; do\
+ for ff in `fh` `fs`; do \
sed 's/ / /g' $$ff > $$ff.temp;\
mv $$ff.temp $$ff;\
done
only in patch2:
unchanged:
--- openscenegraph-0.9.9.orig/Producer/Make/helprules
+++ openscenegraph-0.9.9/Producer/Make/helprules
@@ -1,11 +1,11 @@
help:
- $(TOPDIR)/Make/help.sh\
- $(OS)\
- $(TOPDIR)\
- $(INST_LIBS)\
- $(INST_PLUGINS)\
- $(INST_INCLUDE)\
- $(INST_DEMOS)\
- $(INST_DEMO_SRC)\
- $(INST_DOC)\
+ $(TOPDIR)/Make/help.sh \
+ $(OS) \
+ $(TOPDIR) \
+ $(INST_LIBS) \
+ $(INST_PLUGINS) \
+ $(INST_INCLUDE) \
+ $(INST_DEMOS) \
+ $(INST_DEMO_SRC) \
+ $(INST_DOC) \
$(INST_DATA) | more
only in patch2:
unchanged:
--- openscenegraph-0.9.9.orig/Producer/Make/instrules
+++ openscenegraph-0.9.9/Producer/Make/instrules
@@ -23,16 +23,16 @@
__inst_headers:
@[ -d $(INST_INCLUDE)/Producer ] || mkdir -p $(INST_INCLUDE)/Producer
- @for f in include/Producer/*; do\
+ @for f in include/Producer/*; do \
[ "`head -1 $$f | cut -c 1-12`" = "/* -*-c++-*-" ] && \
echo $(INSTRCMD) $$f $(INST_INCLUDE)/Producer; \
$(INSTRCMD) $$f $(INST_INCLUDE)/Producer; done
__inst_share:
- @for d in `find share/ -type d -print | grep -v CVS`; do\
+ @for d in `find share/ -type d -print | grep -v CVS`; do \
[ -d $(INST_LOCATION)/$$d ] || mkdir -p $(INST_LOCATION)/$$d;\
done
- @for f in `find share/ -type f -print | grep -v CVS`; do\
+ @for f in `find share/ -type f -print | grep -v CVS`; do \
$(INSTRCMD) $$f $(INST_LOCATION)/$$f;\
- done
\ No newline at end of file
+ done
only in patch2:
unchanged:
--- openscenegraph-0.9.9.orig/OpenSceneGraph/Make/makeinnosetup
+++ openscenegraph-0.9.9/OpenSceneGraph/Make/makeinnosetup
@@ -28,7 +28,7 @@
{
DIR=$1
FILE=$2
- printf "Source: \"%s\\\%s\"; DestDir: \"{app}\\\%s\\\"; Flags:
ignoreversion\n"\
+ printf "Source: \"%s\\\%s\"; DestDir: \"{app}\\\%s\\\"; Flags:
ignoreversion\n" \
$DIR $FILE $DIR
}
only in patch2:
unchanged:
--- openscenegraph-0.9.9.orig/OpenSceneGraph/Make/makerules
+++ openscenegraph-0.9.9/OpenSceneGraph/Make/makerules
@@ -109,7 +109,7 @@
@[ -d $(DEBUGDIR) ] || mkdir $(DEBUGDIR)
@cd $(DEBUGDIR); \
$(MAKE) -f ../GNUmakefile "DOF=$(DBGF)" TOPDIR=../${TOPDIR} \
- THISDIR=../$(THISDIR)\
+ THISDIR=../$(THISDIR) \
MAKEDEPEND=Makedepend $(EXEC)
@$(MAKE) LNSRC=$(DEBUGDIR)/$(EXEC)$(EXE_EXT)
LNDEST=$(BININST)/$(EXEC)$(EXE_EXT) __link
@@ -117,15 +117,15 @@
@[ -d $(DEBUGDIR) ] || mkdir $(DEBUGDIR)
@cd $(DEBUGDIR);\
$(MAKE) -f ../GNUmakefile "DOF=$(DBGF)" TOPDIR=../${TOPDIR} \
- THISDIR=../$(THISDIR)\
+ THISDIR=../$(THISDIR) \
MAKEDEPEND=Makedepend $(LIB)
@$(MAKE) LNSRC=$(DEBUGDIR)/$(LIB) LNDEST=$(LIBINST)/$(LIB) __link
$(LIB:.$(LIB_EXT)=.staticdbg) :
@[ -d $(DEBUGDIR) ] || mkdir $(DEBUGDIR)
- @cd $(DEBUGDIR);\
+ @cd $(DEBUGDIR); \
$(MAKE) -f ../GNUmakefile "DOF=$(DBGF)" TOPDIR=../${TOPDIR} \
- THISDIR=../$(THISDIR)\
+ THISDIR=../$(THISDIR) \
MAKEDEPEND=Makedepend $(STATICLIB)
@$(MAKE) LNSRC=$(DEBUGDIR)/$(STATICLIB)
LNDEST=$(LIBINST)/$(OS)$(ARCH)/$(STATICLIB) __link
@@ -133,7 +133,7 @@
@[ -d $(DEBUGDIR) ] || mkdir $(DEBUGDIR)
@cd $(DEBUGDIR); \
$(MAKE) -f ../GNUmakefile "DOF=$(DBGF)" TOPDIR=../${TOPDIR} \
- THISDIR=../$(THISDIR)\
+ THISDIR=../$(THISDIR) \
MAKEDEPEND=Makedepend $(WRAPPER)
@$(MAKE) LNSRC=$(DEBUGDIR)/$(WRAPPER) LNDEST=$(PLUGININST)/$(WRAPPER)
__link
@@ -141,7 +141,7 @@
@[ -d $(DEBUGDIR) ] || mkdir $(DEBUGDIR)
@cd $(DEBUGDIR); \
$(MAKE) -f ../GNUmakefile "DOF=$(DBGF)" TOPDIR=../${TOPDIR} \
- THISDIR=../$(THISDIR)\
+ THISDIR=../$(THISDIR) \
MAKEDEPEND=Makedepend $(PLUGIN)
@$(MAKE) LNSRC=$(DEBUGDIR)/$(PLUGIN) LNDEST=$(PLUGININST)/$(PLUGIN)
__link
@@ -149,7 +149,7 @@
@[ -d $(DEBUGDIR) ] || mkdir -p $(DEBUGDIR)
@cd $(DEBUGDIR); \
$(MAKE) -f ../GNUmakefile "DOF=$(DBGF)" TOPDIR=../${TOPDIR} \
- THISDIR=../$(THISDIR)\
+ THISDIR=../$(THISDIR) \
MAKEDEPEND=Makedepend
STATICPLUGIN=$(PLUGIN:.$(PLUGIN_EXT)=.a) $(STATICPLUGIN)
@$(MAKE) LNSRC=$(DEBUGDIR)/$(STATICPLUGIN)
LNDEST=$(PLUGININST)/$(STATICPLUGIN) __link
@@ -157,7 +157,7 @@
@[ -d $(OPTDIR) ] || mkdir $(OPTDIR)
@cd $(OPTDIR); \
$(MAKE) -f ../GNUmakefile DOF=$(OPTF) TOPDIR=../${TOPDIR} \
- THISDIR=../$(THISDIR)\
+ THISDIR=../$(THISDIR) \
MAKEDEPEND=Makedepend $(EXEC)
@$(MAKE) LNSRC=$(OPTDIR)/$(EXEC)$(EXE_EXT)
LNDEST=$(BININST)/$(EXEC)$(EXE_EXT) __link
@@ -166,7 +166,7 @@
@[ -d $(OPTDIR) ] || mkdir -p $(OPTDIR)
@cd $(OPTDIR);\
$(MAKE) -f ../GNUmakefile DOF=$(OPTF) TOPDIR=../${TOPDIR} \
- THISDIR=../$(THISDIR)\
+ THISDIR=../$(THISDIR) \
MAKEDEPEND=Makedepend $(LIB)
@$(MAKE) LNSRC=$(OPTDIR)/$(LIB) LNDEST=$(LIBINST)/$(LIB) __link
@@ -174,7 +174,7 @@
[ -d $(OPTDIR) ] || mkdir $(OPTDIR)
cd $(OPTDIR);\
$(MAKE) -f ../GNUmakefile DOF=$(OPTF) TOPDIR=../${TOPDIR} \
- THISDIR=../$(THISDIR)\
+ THISDIR=../$(THISDIR) \
MAKEDEPEND=Makedepend $(STATICLIB)
@$(MAKE) LNSRC=$(OPTDIR)/$(STATICLIB)
LNDEST=$(LIBINST)/$(OS)$(ARCH)/$(STATICLIB) __link
@@ -183,7 +183,7 @@
@[ -d $(OPTDIR) ] || mkdir -p $(OPTDIR)
@cd $(OPTDIR); \
$(MAKE) -f ../GNUmakefile DOF=$(OPTF) TOPDIR=../${TOPDIR} \
- THISDIR=../$(THISDIR)\
+ THISDIR=../$(THISDIR) \
MAKEDEPEND=Makedepend $(WRAPPER)
@$(MAKE) LNSRC=$(OPTDIR)/$(WRAPPER) LNDEST=$(PLUGININST)/$(WRAPPER)
__link
@@ -191,7 +191,7 @@
@[ -d $(OPTDIR) ] || mkdir -p $(OPTDIR)
@cd $(OPTDIR); \
$(MAKE) -f ../GNUmakefile DOF=$(OPTF) TOPDIR=../${TOPDIR} \
- THISDIR=../$(THISDIR)\
+ THISDIR=../$(THISDIR) \
MAKEDEPEND=Makedepend $(PLUGIN)
@$(MAKE) LNSRC=$(OPTDIR)/$(PLUGIN) LNDEST=$(PLUGININST)/$(PLUGIN) __link
@@ -199,7 +199,7 @@
@[ -d $(OPTDIR) ] || mkdir -p $(OPTDIR)
@cd $(OPTDIR); \
$(MAKE) -f ../GNUmakefile DOF=$(OPTF) TOPDIR=../${TOPDIR} \
- THISDIR=../$(THISDIR)\
+ THISDIR=../$(THISDIR) \
MAKEDEPEND=Makedepend
STATICPLUGIN=$(PLUGIN:.$(PLUGIN_EXT)=.a) $(STATICPLUGIN)
@$(MAKE) LNSRC=$(OPTDIR)/$(STATICPLUGIN)
LNDEST=$(PLUGININST)/$(STATICPLUGIN) __link
@@ -219,10 +219,10 @@
@if [ ! -d .depend ] ; then \
mkdir .depend;\
depfiles="$+";\
- else\
+ else \
depfiles="$?";\
fi;\
- if [ ! -z "$$depfiles" ]; then\
+ if [ ! -z "$$depfiles" ]; then \
for f in $$depfiles; do \
echo "$(C++) $(DEPARG) $(INC) $$f pipeto .depend/`basename
$$f`"; \
$(C++) $(DEPARG) $(INC) $$f > .depend/`basename $$f`; \
only in patch2:
unchanged:
--- openscenegraph-0.9.9.orig/OpenSceneGraph/Make/versionrules
+++ openscenegraph-0.9.9/OpenSceneGraph/Make/versionrules
@@ -13,9 +13,9 @@
## 'make version' will print the version with a
#######################################################################
version :
- @if [ "$(VERSION_REVISION)" = "0" ]; then\
+ @if [ "$(VERSION_REVISION)" = "0" ]; then \
release=`date +%Y%m%d%H%M`;\
- else\
+ else \
release=$(VERSION_REVISION);\
fi;\
echo $(VERSION)-$$release;
only in patch2:
unchanged:
--- openscenegraph-0.9.9.orig/OpenSceneGraph/Make/makepkg
+++ openscenegraph-0.9.9/OpenSceneGraph/Make/makepkg
@@ -168,10 +168,10 @@
PKGSUBDIR=dist/PKG
-make_package\
+make_package \
"OpenSceneGraph" \
- "Open Scene Graph - Run-time environment"\
- "An OpenGL based scene graph. This installation includes a set of
run-time libraries, and example programs"\
+ "Open Scene Graph - Run-time environment" \
+ "An OpenGL based scene graph. This installation includes a set of
run-time libraries, and example programs" \
$INST_LIBS $INST_PLUGINS $INST_EXAMPLES\
make_installable "OpenSceneGraph"
@@ -208,10 +208,10 @@
[ -d $dd ] && INSTARG="$INSTARG $dd"
-make_package\
- "OpenSceneGraph-dev"\
- "Open Scene Graph - Development environment"\
- "An OpenGL based scene graph. This installation includes header files
and example program source files"\
+make_package \
+ "OpenSceneGraph-dev" \
+ "Open Scene Graph - Development environment" \
+ "An OpenGL based scene graph. This installation includes header files
and example program source files" \
$INSTARG
make_installable "OpenSceneGraph-dev"
only in patch2:
unchanged:
--- openscenegraph-0.9.9.orig/OpenSceneGraph/Make/helprules
+++ openscenegraph-0.9.9/OpenSceneGraph/Make/helprules
@@ -1,11 +1,11 @@
help:
- @sh $(TOPDIR)/Make/help.sh\
- $(OS)\
- $(TOPDIR)\
- $(INST_LIBS)\
- $(INST_PLUGINS)\
- $(INST_INCLUDE)\
- $(INST_DEMOS)\
- $(INST_DEMO_SRC)\
- $(INST_DOC)\
+ @sh $(TOPDIR)/Make/help.sh \
+ $(OS) \
+ $(TOPDIR) \
+ $(INST_LIBS) \
+ $(INST_PLUGINS) \
+ $(INST_INCLUDE) \
+ $(INST_DEMOS) \
+ $(INST_DEMO_SRC) \
+ $(INST_DOC) \
$(INST_DATA) | more
only in patch2:
unchanged:
--- openscenegraph-0.9.9.orig/OpenSceneGraph/Make/instrules
+++ openscenegraph-0.9.9/OpenSceneGraph/Make/instrules
@@ -29,32 +29,32 @@
__instdev:
@for d in `ls -1 $(TOPDIR)/include/ | grep -v CVS`; \
- do\
+ do \
if [ -d $(TOPDIR)/include/$$d ]; \
then \
- $(MAKE) INSTSRC=$(TOPDIR)/include/$$d INSTDEST=$(INST_INCLUDE)/$$d\
+ $(MAKE) INSTSRC=$(TOPDIR)/include/$$d INSTDEST=$(INST_INCLUDE)/$$d \
INSTALL?="$(INSTDEVCMD)" __install;\
- fi\
+ fi;\
done
@$(TOPDIR)/Make/instexamplesrc \
- $(TOPDIR)\
- $(INST_LIBS)\
- $(INST_INCLUDE)\
- $(INST_SRC)\
- $(INST_EXAMPLE_SRC)\
- "$(INSTDEVCMD)"\
- "$(C++)"\
- "$(OPTF)"\
- "$(DEPARG)"\
- "$(LINKARGS)"\
- "$(OSG_LIBS)"\
- "$(FREETYPE_LIB)"\
- "$(GLUT_LIB)"\
- "$(GL_LIBS)"\
- "$(X_LIBS)"\
- "$(SOCKET_LIBS)"\
- "$(OTHER_LIBS)"\
- "$(TIFF_LIB)"\
+ $(TOPDIR) \
+ $(INST_LIBS) \
+ $(INST_INCLUDE) \
+ $(INST_SRC) \
+ $(INST_EXAMPLE_SRC) \
+ "$(INSTDEVCMD)" \
+ "$(C++)" \
+ "$(OPTF)" \
+ "$(DEPARG)" \
+ "$(LINKARGS)" \
+ "$(OSG_LIBS)" \
+ "$(FREETYPE_LIB)" \
+ "$(GLUT_LIB)" \
+ "$(GL_LIBS)" \
+ "$(X_LIBS)" \
+ "$(SOCKET_LIBS)" \
+ "$(OTHER_LIBS)" \
+ "$(TIFF_LIB)" \
$(MAKE)
@@ -94,23 +94,23 @@
INSTALL?="$(INSTBINCMD)" __instclean
@$(MAKE) INSTSRC=$(TOPDIR)/lib/$(OS)$(ARCH) INSTDEST=$(INST_LIBS) \
INSTALL?="$(INSTBINCMD)" __instclean
- @$(MAKE) INSTSRC=$(TOPDIR)/lib/$(OS)$(ARCH)/osgPlugins
INSTDEST=$(INST_PLUGINS)\
+ @$(MAKE) INSTSRC=$(TOPDIR)/lib/$(OS)$(ARCH)/osgPlugins
INSTDEST=$(INST_PLUGINS) \
INSTALL?="$(INSTBINCMD)" __instclean
instcleandev :
@for d in `ls -1 $(TOPDIR)/include/ | grep -v CVS`; \
- do\
+ do \
if [ -d $(TOPDIR)/include/$$d ]; \
then \
- $(MAKE) INSTSRC=$(TOPDIR)/include/$$d INSTDEST=$(INST_INCLUDE)/$$d\
+ $(MAKE) INSTSRC=$(TOPDIR)/include/$$d INSTDEST=$(INST_INCLUDE)/$$d \
INSTALL?="$(INSTDEVCMD)" __instclean;\
fi\
done
@for d in `ls -1 $(TOPDIR)/examples | grep -v CVS`; \
- do\
+ do \
if [ -d $(TOPDIR)/examples/$$d ]; \
then \
- $(MAKE) INSTSRC=$(TOPDIR)/examples/$$d
INSTDEST=$(INST_EXAMPLE_SRC)/$$d\
+ $(MAKE) INSTSRC=$(TOPDIR)/examples/$$d
INSTDEST=$(INST_EXAMPLE_SRC)/$$d \
INSTALL?="$(INSTDEVCMD)" __instclean;\
fi\
done
@@ -123,15 +123,15 @@
@[ -d $(INSTDEST) ] || mkdir -p $(INSTDEST)
@cd $(INSTSRC);\
THISDIR=`pwd`;\
- if [ -n "`ls -1 | grep -v CVS`" ]; then\
+ if [ -n "`ls -1 | grep -v CVS`" ]; then \
for f in `ls -1 | grep -v CVS`; \
- do\
+ do \
if [ -f $$f ] ; \
then \
INSTPATH=$$THISDIR/$$f; \
$(INSTALL) $$INSTPATH $(INSTDEST)/$$f;\
- fi\
- done\
+ fi;\
+ done;\
fi
__instclean :
@@ -140,21 +140,21 @@
@[ -n "$(INSTDEST)" ] || echo "Internal error (INSTDEST definition)"
@[ -n "$(INSTDEST)" ] && echo > /dev/null
@if [ -d $(INSTDEST) ] ; \
- then\
+ then \
cd $(INSTSRC);\
- if [ -n "`ls -1 | grep -v CVS`" ]; then\
+ if [ -n "`ls -1 | grep -v CVS`" ]; then \
for f in `ls -1 | grep -v CVS`; \
- do\
+ do \
if [ -f $$f ] ; \
then \
echo "rm -f $(INSTDEST)/$$f";\
rm -f $(INSTDEST)/$$f;\
- fi\
- done\
+ fi;\
+ done;\
fi;\
empty=`ls $(INSTDEST)`;\
if [ -z "$$empty" ];\
- then\
+ then \
rm -rf $(INSTDEST);\
fi\
fi
