Cleaned up inst rules a bit...

This commit is contained in:
Don BURNS 2001-09-28 19:36:58 +00:00
parent 12f77f141e
commit 4c4d99f19a
3 changed files with 19 additions and 46 deletions

View File

@ -61,22 +61,23 @@ __install : $(TARGET) $(LIB)
else\ else\
echo No loaders installed ...;\ echo No loaders installed ...;\
fi fi
@if [ -n "$(TARGET_DATA_FILES)" ] ;\ # deprecate OSGDATA
then\ # @if [ -n "$(TARGET_DATA_FILES)" ] ;\
if [ -n "$(OSGDATA)" ] ;\ # then\
then\ # if [ -n "$(OSGDATA)" ] ;\
for f in $(TARGET_DATA_FILES);\ # then\
do\ # for f in $(TARGET_DATA_FILES);\
(echo copying $(OSGDATA)/$$f to $(TARGET_DATA)/$$f; \ # do\
cp -f $(OSGDATA)/$$f $(TARGET_DATA)/$$f; )\ # (echo copying $(OSGDATA)/$$f to $(TARGET_DATA)/$$f; \
done\ # cp -f $(OSGDATA)/$$f $(TARGET_DATA)/$$f; )\
else\ # done\
echo;\ # else\
echo "-------------- > Please define OSGDATA";\ # echo;\
echo; \ # echo "-------------- > Please define OSGDATA";\
[ -n "$(OSGDATA)" ] && echo > /dev/null;\ # echo; \
fi\ # [ -n "$(OSGDATA)" ] && echo > /dev/null;\
fi # fi\
# fi
__instlinks : $(TARGET) $(LIB) __instlinks : $(TARGET) $(LIB)

View File

@ -108,14 +108,8 @@ dev: $(MAKE_PREP)
$(MAKE) clobber; $(MAKE) clobber;
(cd ..; tar cvf - $(VERSION) | gzip > osg-`date "+%Y%m%d"`.tar.gz) (cd ..; tar cvf - $(VERSION) | gzip > osg-`date "+%Y%m%d"`.tar.gz)
install : install instlinks instclean :
for f in $(DIRS) ; do cd $$f; $(MAKE) install; cd ..; done export OSGHOME=`pwd`; for f in $(DIRS) ; do cd $$f; $(MAKE) $@; cd ..; done
instlinks :
for f in $(DIRS) ; do cd $$f; $(MAKE) instlinks; cd ..; done
instclean :
for f in $(DIRS) ; do cd $$f; $(MAKE) instclean; cd ..; done
instcheck : instcheck :
diff -q include/osg/ /usr/include/osg/ diff -q include/osg/ /usr/include/osg/

View File

@ -121,28 +121,6 @@ TARGET_INCLUDE_FILES = \
osg/ref_ptr\ osg/ref_ptr\
TARGET_DATA_FILES = \
cessna.osg\
cow.osg\
dumptruck.osg\
e-s-bike.osg\
flight_park.fly\
glider.osg\
ncc1701d.osg\
paraglider.osg\
torus.osg\
turtle.osg\
Test/CullFace.osg\
Test/Point.osg\
Test/PolygonOffset.osg\
Images/lz.rgb\
Images/reflect.rgb\
Images/tank.rgb\
Images/tree0.rgba\
Images/water.rgb\
Images/white.rgb\
LIBS = -lGLU -lGL -lm LIBS = -lGLU -lGL -lm
LIB = ../../lib/lib$(TARGET_BASENAME).so LIB = ../../lib/lib$(TARGET_BASENAME).so