From 8e0c273c65af3283053b5ffbc23fdb45850fc32c Mon Sep 17 00:00:00 2001 From: Don BURNS Date: Mon, 1 Apr 2002 15:37:21 +0000 Subject: [PATCH] Added cleanlite rules to makerules.new --- Make/makedefs.new | 11 ++++++----- Make/makerules.new | 9 +++++++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Make/makedefs.new b/Make/makedefs.new index eb973573d..0152e3f97 100644 --- a/Make/makedefs.new +++ b/Make/makedefs.new @@ -23,9 +23,9 @@ LIBINST = lib PLUGININST = lib/osgPlugins INST_DEMOS = /usr/share/OpenSceneGraph/bin -INST_LIBS = /usr/share/OpenSceneGraph/lib -INST_PLUGINS = /usr/share/OpenSceneGraph/lib/osgPlugins -INST_INCLUDE = /usr/share/OpenSceneGraph/include +INST_LIBS = /usr/lib$(ARCH) +INST_PLUGINS = /usr/lib$(ARCH)/osgPlugins +INST_INCLUDE = /usr/include INST_DEMO_SRC = /usr/share/OpenSceneGraph/src/demos INST_DATA = /usr/share/OpenSceneGraph/data @@ -92,6 +92,7 @@ ifeq ($(OS),IRIX) OPTF = -O2 DBGF = -g SHARED = -shared + ARCH = 32 ifeq ($(ARCH),64) ARCHARGS = -64 else @@ -109,8 +110,8 @@ endif SO_EXT = so PLUGIN_EXT = so - INSTLINKBIN = install -t -m 755 - INSTLINKDEV = install -t -m 644 +# INSTLINKBIN = install -t -m 755 +# INSTLINKDEV = install -t -m 644 endif diff --git a/Make/makerules.new b/Make/makerules.new index 2ffd7c55f..23d90861e 100644 --- a/Make/makerules.new +++ b/Make/makerules.new @@ -9,7 +9,16 @@ debug : $(EXEC:=.dbg)\ $(LIB:=.dbg)\ $(PLUGIN:=.dbg)\ +cleanlite : cleanliteopt cleanlitedbg + +cleanliteopt : + @[ -d $(OPTDIR) ] && cd $(OPTDIR); rm -f $(EXEC) $(LIB) $(PLUGIN) + +cleanlitedbg : + @[ -d $(DEBUGDIR) ] && cd $(DEBUGDIR); rm -f $(EXEC) $(LIB) $(PLUGIN) + clean : cleanopt cleandbg + @[ -d $(OPTDIR) ] && cd $(OPTDIR); rm -f $(OBJS) $(MAKEDEPEND) cleanopt : @[ -d $(OPTDIR) ] && cd $(OPTDIR); rm -f $(OBJS) $(MAKEDEPEND)