FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Robert Swain, compile fix for debian unstable.

Browse Source
This commit is contained in:
Robert Osfield 2006-03-02 15:26:12 +00:00
parent 507fb0074f
commit c42e14dd1f
6 changed files with 268 additions and 268 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Make/helprules
View File

@ -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

128
Make/instrules
View File

@ -11,65 +11,65 @@ __instbin:
INSTALL?="$(INSTBINCMD)" __install
@$(MAKE) INSTSRC=$(TOPDIR)/lib/$(OS)$(ARCH) INSTDEST=$(INST_LIBS) \
INSTALL?="$(INSTBINCMD)" __install
@$(MAKE) INSTSRC=$(TOPDIR)/lib/$(OS)$(ARCH)/osgPlugins INSTDEST=$(INST_PLUGINS)\
@$(MAKE) INSTSRC=$(TOPDIR)/lib/$(OS)$(ARCH)/osgPlugins INSTDEST=$(INST_PLUGINS) \
INSTALL?="$(INSTBINCMD)" __install
ifdef IMP_LIB_EXT
@$(MAKE) INSTSRC=$(TOPDIR)/bin/$(OS)$(ARCH)/osgPlugins INSTDEST=$(INST_EXAMPLES)/osgPlugins\
@$(MAKE) INSTSRC=$(TOPDIR)/bin/$(OS)$(ARCH)/osgPlugins INSTDEST=$(INST_EXAMPLES)/osgPlugins \
INSTALL?="$(INSTBINCMD)" __install
endif
@echo >> $(INSTLOGFILE)
@echo " Run-time environment installation successful. Add "\
@echo " Run-time environment installation successful. Add " \
>> $(INSTLOGFILE)
@echo " $(INST_EXAMPLES)"\
@echo " $(INST_EXAMPLES)" \
>> $(INSTLOGFILE)
@echo " to your PATH environmental variable, and"\
@echo " to your PATH environmental variable, and" \
>> $(INSTLOGFILE)
@echo " $(INST_LIBS) and $(INST_PLUGINS)"\
@echo " $(INST_LIBS) and $(INST_PLUGINS)" \
>> $(INSTLOGFILE)
@echo " to your LD_LIBRARY_PATH if not already present."\
@echo " to your LD_LIBRARY_PATH if not already present." \
>> $(INSTLOGFILE)
@echo >> $(INSTLOGFILE)
__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\
INSTALL?="$(INSTDEVCMD)" __install;\
fi\
$(MAKE) INSTSRC=$(TOPDIR)/include/$$d INSTDEST=$(INST_INCLUDE)/$$d \
INSTALL?="$(INSTDEVCMD)" __install; \
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)
@echo\
@echo \
>> $(INSTLOGFILE)
@echo " Development environment installation successful. Add"\
@echo " Development environment installation successful. Add" \
>> $(INSTLOGFILE)
@echo " -I$(INST_INCLUDE)"\
@echo " -I$(INST_INCLUDE)" \
>> $(INSTLOGFILE)
@echo " compile flag when compiling with OSG header files."\
@echo " compile flag when compiling with OSG header files." \
>> $(INSTLOGFILE)
@echo " Example programs can be found at $(INST_EXAMPLE_SRC)."\
@echo " Example programs can be found at $(INST_EXAMPLE_SRC)." \
>> $(INSTLOGFILE)
@echo >> $(INSTLOGFILE)
@ -97,25 +97,25 @@ instcleanbin :
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\
INSTALL?="$(INSTDEVCMD)" __instclean;\
fi\
$(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\
INSTALL?="$(INSTDEVCMD)" __instclean;\
fi\
$(MAKE) INSTSRC=$(TOPDIR)/examples/$$d INSTDEST=$(INST_EXAMPLE_SRC)/$$d \
INSTALL?="$(INSTDEVCMD)" __instclean; \
fi \
done
__install :
@ -124,17 +124,17 @@ __install :
@[ -n "$(INSTDEST)" ] || echo "Internal error (INSTDEST definition)"
@[ -n "$(INSTDEST)" ] && echo > /dev/null
@[ -d $(INSTDEST) ] || mkdir -p $(INSTDEST)
@cd $(INSTSRC);\
THISDIR=`pwd`;\
if [ -n "`ls -1 | grep -v CVS`" ]; then\
@cd $(INSTSRC); \
THISDIR=`pwd`; \
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\
$(INSTALL) "$$INSTPATH" "$(INSTDEST)/$$f"; \
fi \
done \
fi
__instclean :
@ -143,23 +143,23 @@ __instclean :
@[ -n "$(INSTDEST)" ] || echo "Internal error (INSTDEST definition)"
@[ -n "$(INSTDEST)" ] && echo > /dev/null
@if [ -d $(INSTDEST) ] ; \
then\
cd $(INSTSRC);\
if [ -n "`ls -1 | grep -v CVS`" ]; then\
then \
cd $(INSTSRC); \
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;\
empty=`ls $(INSTDEST)`;\
if [ -z "$$empty" ];\
then\
rm -rf $(INSTDEST);\
fi\
echo "rm -f $(INSTDEST)/$$f"; \
rm -f $(INSTDEST)/$$f; \
fi \
done \
fi; \
empty=`ls $(INSTDEST)`; \
if [ -z "$$empty" ]; \
then \
rm -rf $(INSTDEST); \
fi \
fi

40
Make/makedefs
View File

@ -133,25 +133,25 @@ endif
RECURSIVE_TARGETS = \
opt\
debug\
static\
staticdebug\
clean\
cleandepend\
cleandependopt\
cleandependdbg\
cleandbg\
cleanopt\
cleantarget\
cleantargetopt\
cleantargetdbg\
clobber\
clobberdbg\
clobberopt\
beautify\
docs\
depend\
opt \
debug \
static \
staticdebug \
clean \
cleandepend \
cleandependopt \
cleandependdbg \
cleandbg \
cleanopt \
cleantarget \
cleantargetopt \
cleantargetdbg \
clobber \
clobberdbg \
clobberopt \
beautify \
docs \
depend \
STATICLIB = $(LIB:.$(LIB_EXT)=.a)
STATICPLUGIN = $(PLUGIN:.$(PLUGIN_EXT)=.a)
@ -241,7 +241,7 @@ ifeq ($(OS),IRIX)
INC += -I${TOPDIR}/include -I/usr/freeware/include
LDFLAGS += -L/usr/local/lib
DEF += -LANG:std -OPT:Olimit=0 \
-DEBUG:woff=1681 -DEBUG:woff=1682 -DEBUG:woff=3303\
-DEBUG:woff=1681 -DEBUG:woff=1682 -DEBUG:woff=3303 \
-MDupdate $(MAKEDEPEND)
OPTF = -O2
DBGF = -g -DOSG_COMPILE_UNIT_TESTS

262
Make/makedirdefs
View File

@ -2,7 +2,7 @@
################################################################
# Directories traversed from the top level
TOP_LEVEL_DIRS = \
src\
src \
applications
ifeq ($(COMPILE_EXAMPLES),yes)
@ -13,13 +13,13 @@ endif
################################################################
# Directories traversed in the TOPDIR/src directory
SRC_DIRS = \
osg\
osgUtil\
osgDB\
osgGA\
osgParticle\
osgText\
osgFX\
osg \
osgUtil \
osgDB \
osgGA \
osgParticle \
osgText \
osgFX \
osgSim
ifeq ($(PRODUCER_INSTALLED),yes)
@ -32,22 +32,22 @@ endif
ifeq ($(COMPILE_INTROSPECTION),yes)
SRC_DIRS += \
osgIntrospection\
osgIntrospection \
osgWrappers
endif
SRC_DIRS += \
osgPlugins\
osgPlugins \
WRAPPER_DIRS = \
osg\
osgParticle\
osgSim\
osgUtil\
osgDB\
osgFX\
osgText\
osg \
osgParticle \
osgSim \
osgUtil \
osgDB \
osgFX \
osgText \
osgGA
ifeq ($(PRODUCER_INSTALLED),yes)
@ -63,43 +63,43 @@ endif
# Directories traversed in the TOPDIR/src/osgPlugins directory
PLUGIN_DIRS = \
3dc\
ac3d\
bmp\
dds\
directx\
dw\
dxf\
ESRIShape\
flt\
hdr\
ive\
lib3ds\
logo\
lwo\
lws\
md2\
net\
normals\
obj\
osg\
osga\
osgFX\
osgParticle\
osgSim\
osgText\
osgtgz\
pic\
pnm\
rgb\
rot\
scale\
stl\
tga\
tgz\
trans\
txp\
zip\
3dc \
ac3d \
bmp \
dds \
directx \
dw \
dxf \
ESRIShape \
flt \
hdr \
ive \
lib3ds \
logo \
lwo \
lws \
md2 \
net \
normals \
obj \
osg \
osga \
osgFX \
osgParticle \
osgSim \
osgText \
osgtgz \
pic \
pnm \
rgb \
rot \
scale \
stl \
tga \
tgz \
trans \
txp \
zip \
ifeq ($(GDAL_INSTALLED),yes)
@ -173,9 +173,9 @@ APPLICATION_DIRS = \
ifeq ($(PRODUCER_INSTALLED),yes)
APPLICATION_DIRS += osgarchive\
osgconv\
osgviewer\
APPLICATION_DIRS += osgarchive \
osgconv \
osgviewer \
ifeq ($(GDAL_INSTALLED),yes)
APPLICATION_DIRS += osgdem
@ -189,80 +189,80 @@ EXAMPLE_DIRS =
ifeq ($(PRODUCER_INSTALLED),yes)
EXAMPLE_DIRS += osganimate\
osgautotransform\
osgbillboard\
osgblendequation\
osgcallback\
osgcatch\
osgcamera\
osgcameragroup\
osgclip\
osgcluster\
osgcopy\
osgcubemap\
osgdelaunay\
osgdepthshadow\
osgdepthpartition\
osgdistortion\
osgfbo\
osgforest\
osgfxbrowser\
osggeodemo\
osggeometry\
osghangglide\
osghud\
osgimpostor\
osgkeyboard\
osgkeyboardmouse\
osglauncher\
osglight\
osglightpoint\
osglogicop\
osglogo\
osgmotionblur\
osgmovie\
osgmultitexture\
osgmultiplecameras\
osgoccluder\
osgpagedlod\
osgparametric\
osgparticle\
osgparticleeffects\
osgpbuffer\
osgpick\
osgplanets\
osgpoints\
osgpointsprite\
osgprerender\
osgprerendercubemap\
osgreflect\
osgscalarbar\
osgscribe\
osgsequence\
osgshaders\
osgshaderterrain\
osgshadowtexture\
osgshape\
osgsimple\
osgsimplepager\
osgsimplifier\
osgslice\
osgspacewarp\
osgspheresegment\
osgspotlight\
osgstereoimage\
osgteapot\
osgtesselate\
osgtext\
osgtexture1D\
osgtexture2D\
osgtexture3D\
osgtexturerectangle\
osgunittests\
osgvertexprogram\
osgvolume\
osgwindows\
EXAMPLE_DIRS += osganimate \
osgautotransform \
osgbillboard \
osgblendequation \
osgcallback \
osgcatch \
osgcamera \
osgcameragroup \
osgclip \
osgcluster \
osgcopy \
osgcubemap \
osgdelaunay \
osgdepthshadow \
osgdepthpartition \
osgdistortion \
osgfbo \
osgforest \
osgfxbrowser \
osggeodemo \
osggeometry \
osghangglide \
osghud \
osgimpostor \
osgkeyboard \
osgkeyboardmouse \
osglauncher \
osglight \
osglightpoint \
osglogicop \
osglogo \
osgmotionblur \
osgmovie \
osgmultitexture \
osgmultiplecameras \
osgoccluder \
osgpagedlod \
osgparametric \
osgparticle \
osgparticleeffects \
osgpbuffer \
osgpick \
osgplanets \
osgpoints \
osgpointsprite \
osgprerender \
osgprerendercubemap \
osgreflect \
osgscalarbar \
osgscribe \
osgsequence \
osgshaders \
osgshaderterrain \
osgshadowtexture \
osgshape \
osgsimple \
osgsimplepager \
osgsimplifier \
osgslice \
osgspacewarp \
osgspheresegment \
osgspotlight \
osgstereoimage \
osgteapot \
osgtesselate \
osgtext \
osgtexture1D \
osgtexture2D \
osgtexture3D \
osgtexturerectangle \
osgunittests \
osgvertexprogram \
osgvolume \
osgwindows \
ifeq ($(COMPILE_INTROSPECTION),yes)
EXAMPLE_DIRS += osgintrospection

78
Make/makerules
View File

@ -2,24 +2,24 @@
default: opt
opt: \
$(EXEC:=.opt)\
$(LIB:=.opt)\
$(WRAPPER:=.opt)\
$(PLUGIN:=.opt)\
$(EXEC:=.opt) \
$(LIB:=.opt) \
$(WRAPPER:=.opt) \
$(PLUGIN:=.opt) \
debug: \
$(EXEC:=.dbg)\
$(LIB:=.dbg)\
$(WRAPPER:=.dbg)\
$(PLUGIN:=.dbg)\
$(EXEC:=.dbg) \
$(LIB:=.dbg) \
$(WRAPPER:=.dbg) \
$(PLUGIN:=.dbg) \
static:\
$(LIB:.$(LIB_EXT)=.static)\
$(PLUGIN:.$(PLUGIN_EXT)=.static)\
static: \
$(LIB:.$(LIB_EXT)=.static) \
$(PLUGIN:.$(PLUGIN_EXT)=.static) \
staticdebug:\
$(LIB:.$(LIB_EXT)=.staticdbg)\
$(PLUGIN:.$(LIB_EXT)=.staticdbg)\
staticdebug: \
$(LIB:.$(LIB_EXT)=.staticdbg) \
$(PLUGIN:.$(LIB_EXT)=.staticdbg) \
cleandepend: cleandependopt cleandependdbg
@ -63,7 +63,7 @@ docs:
mkdir -p $(TOPDIR)/doc/doc++/$(TARGET_BASENAME) && \
doc++ -d $(TOPDIR)/doc/doc++/$(TARGET_BASENAME) -H -A \
$(TOPDIR)/include/$(TARGET_BASENAME)/* && \
echo "$(TARGET_BASENAME) HTML documentation created in "\
echo "$(TARGET_BASENAME) HTML documentation created in " \
"$(TOPDIR)/doc/doc++/$(TARGET_BASENAME)"
@ -109,15 +109,15 @@ $(EXEC:=.dbg) :
@[ -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
$(LIB:=.dbg) :
@[ -d $(DEBUGDIR) ] || mkdir $(DEBUGDIR)
@cd $(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
ifdef IMP_LIB_EXT
@ -126,9 +126,9 @@ endif
$(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
@ -136,7 +136,7 @@ $(WRAPPER:=.dbg) :
@[ -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
@ -144,7 +144,7 @@ $(PLUGIN:=.dbg) :
@[ -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
ifdef IMP_LIB_EXT
@ -155,7 +155,7 @@ $(PLUGIN:.$(PLUGIN_EXT)=.staticdbg) :
@[ -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
@ -163,16 +163,16 @@ $(EXEC:=.opt) :
@[ -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
$(LIB:=.opt) :
@[ -d $(OPTDIR) ] || mkdir -p $(OPTDIR)
@cd $(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
ifdef IMP_LIB_EXT
@ -181,9 +181,9 @@ endif
$(LIB:.$(LIB_EXT)=.static) :
[ -d $(OPTDIR) ] || mkdir $(OPTDIR)
cd $(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
@ -191,7 +191,7 @@ $(WRAPPER:=.opt) :
@[ -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
@ -199,7 +199,7 @@ $(PLUGIN:=.opt) :
@[ -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
ifdef IMP_LIB_EXT
@ -210,7 +210,7 @@ $(PLUGIN:.$(PLUGIN_EXT)=.static) :
@[ -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
@ -228,17 +228,17 @@ ifeq ($(OS),IRIX)
else
@ touch $@
@if [ ! -d .depend ] ; then \
mkdir .depend;\
depfiles="$+";\
else\
depfiles="$?";\
fi;\
if [ ! -z "$$depfiles" ]; then\
mkdir .depend; \
depfiles="$+"; \
else \
depfiles="$?"; \
fi; \
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`; \
grep $$f $@ || echo include .depend/`basename $$f` >> Makedepend ;\
done;\
grep $$f $@ || echo include .depend/`basename $$f` >> Makedepend ; \
done; \
fi
endif

10
Make/versionrules
View File

@ -13,9 +13,9 @@
## 'make version' will print the version with a
#######################################################################
version :
@if [ "$(VERSION_REVISION)" = "0" ]; then\
release=`date +%Y%m%d%H%M`;\
else\
release=$(VERSION_REVISION);\
fi;\
@if [ "$(VERSION_REVISION)" = "0" ]; then \
release=`date +%Y%m%d%H%M`; \
else \
release=$(VERSION_REVISION); \
fi; \
echo $(VERSION)-$$release;