diff --git a/Makefile b/GNUmakefile similarity index 100% rename from Makefile rename to GNUmakefile diff --git a/Make/makedefs b/Make/makedefs index e26195307..75240ca46 100644 --- a/Make/makedefs +++ b/Make/makedefs @@ -17,7 +17,7 @@ ifeq ($(findstring MINGW,$(OS)),MINGW) OS := MINGW endif -# TOPDIR needs to be redefined for every Makefile +# TOPDIR needs to be redefined for every GNUmakefile TOPDIR ?= ../ THISDIR = . MAKEDEPEND = ignore diff --git a/Make/makerules b/Make/makerules index 0c09e2c48..8c2479554 100644 --- a/Make/makerules +++ b/Make/makerules @@ -12,10 +12,10 @@ debug : $(EXEC:=.dbg)\ cleandepend : cleandependopt cleandependdbg cleandependopt : - @[ -d $(OPTDIR) ] && cd $(OPTDIR); rm -f Makedepend + [ -d $(OPTDIR) ] && cd $(OPTDIR); rm -f Makedepend; rm -rf .depend cleandependdbg : - @[ -d $(DEBUGDIR) ] && cd $(DEBUGDIR); rm -f Makedepend + [ -d $(DEBUGDIR) ] && cd $(DEBUGDIR); rm -f Makedepend; rm -rf .depend cleantarget : cleantargetopt cleantargetdbg @@ -28,10 +28,10 @@ cleantargetdbg : clean : cleanopt cleandbg cleanopt : - @[ -d $(OPTDIR) ] && cd $(OPTDIR); rm -f $(OBJS) Makedepend + [ -d $(OPTDIR) ] && cd $(OPTDIR); rm -f $(OBJS) Makedepend; rm -rf .depend cleandbg : - @[ -d $(DEBUGDIR) ] && cd $(DEBUGDIR); rm -f $(OBJS) Makedepend + [ -d $(DEBUGDIR) ] && cd $(DEBUGDIR); rm -f $(OBJS) Makedepend; rm -rf .depend clobber : clobberdbg clobberopt @@ -86,7 +86,7 @@ endif # not Darwin $(EXEC:=.dbg) : @[ -d $(DEBUGDIR) ] || mkdir $(DEBUGDIR) @cd $(DEBUGDIR); \ - $(MAKE) -f ../Makefile "DOF=$(DBGF)" TOPDIR=../${TOPDIR} \ + $(MAKE) -f ../GNUmakefile "DOF=$(DBGF)" TOPDIR=../${TOPDIR} \ THISDIR=../$(THISDIR)\ MAKEDEPEND=Makedepend $(EXEC) @$(MAKE) LNSRC=$(DEBUGDIR)/$(EXEC) LNDEST=$(BININST)/$(EXEC) __link @@ -94,7 +94,7 @@ $(EXEC:=.dbg) : $(LIB:=.dbg) : $(PLUGIN:=.dbg) @[ -d $(DEBUGDIR) ] || mkdir $(DEBUGDIR) @cd $(DEBUGDIR);\ - $(MAKE) -f ../Makefile "DOF=$(DBGF)" TOPDIR=../${TOPDIR} \ + $(MAKE) -f ../GNUmakefile "DOF=$(DBGF)" TOPDIR=../${TOPDIR} \ THISDIR=../$(THISDIR)\ MAKEDEPEND=Makedepend $(LIB) @$(MAKE) LNSRC=$(DEBUGDIR)/$(LIB) LNDEST=$(LIBINST)/$(LIB) __link @@ -102,7 +102,7 @@ $(LIB:=.dbg) : $(PLUGIN:=.dbg) $(PLUGIN:=.dbg) : @[ -d $(DEBUGDIR) ] || mkdir $(DEBUGDIR) @cd $(DEBUGDIR); \ - $(MAKE) -f ../Makefile "DOF=$(DBGF)" TOPDIR=../${TOPDIR} \ + $(MAKE) -f ../GNUmakefile "DOF=$(DBGF)" TOPDIR=../${TOPDIR} \ THISDIR=../$(THISDIR)\ MAKEDEPEND=Makedepend $(PLUGIN) @$(MAKE) LNSRC=$(DEBUGDIR)/$(PLUGIN) LNDEST=$(PLUGININST)/$(PLUGIN) __link @@ -110,7 +110,7 @@ $(PLUGIN:=.dbg) : $(EXEC:=.opt) : @[ -d $(OPTDIR) ] || mkdir $(OPTDIR) @cd $(OPTDIR); \ - $(MAKE) -f ../Makefile DOF=$(OPTF) TOPDIR=../${TOPDIR} \ + $(MAKE) -f ../GNUmakefile DOF=$(OPTF) TOPDIR=../${TOPDIR} \ THISDIR=../$(THISDIR)\ MAKEDEPEND=Makedepend $(EXEC) @$(MAKE) LNSRC=$(OPTDIR)/$(EXEC) LNDEST=$(BININST)/$(EXEC) __link @@ -119,7 +119,7 @@ $(EXEC:=.opt) : $(LIB:=.opt) : @[ -d $(OPTDIR) ] || mkdir -p $(OPTDIR) @cd $(OPTDIR);\ - $(MAKE) -f ../Makefile DOF=$(OPTF) TOPDIR=../${TOPDIR} \ + $(MAKE) -f ../GNUmakefile DOF=$(OPTF) TOPDIR=../${TOPDIR} \ THISDIR=../$(THISDIR)\ MAKEDEPEND=Makedepend $(LIB) @$(MAKE) LNSRC=$(OPTDIR)/$(LIB) LNDEST=$(LIBINST)/$(LIB) __link @@ -127,27 +127,58 @@ $(LIB:=.opt) : $(PLUGIN:=.opt) : @[ -d $(OPTDIR) ] || mkdir -p $(OPTDIR) @cd $(OPTDIR); \ - $(MAKE) -f ../Makefile DOF=$(OPTF) TOPDIR=../${TOPDIR} \ + $(MAKE) -f ../GNUmakefile DOF=$(OPTF) TOPDIR=../${TOPDIR} \ THISDIR=../$(THISDIR)\ MAKEDEPEND=Makedepend $(PLUGIN) @$(MAKE) LNSRC=$(OPTDIR)/$(PLUGIN) LNDEST=$(PLUGININST)/$(PLUGIN) __link -Makedepend : $(CXXFILES) $(CFILES) -ifeq ($(OS),IRIX) +## Revamped method for making Makedepend files +## Under this method, Makedepend simply includes +## all dependency files which are built for each +## individual source file. At update, only the individual +## dependency file is updated rather than the whole of Makedepend + +Makedepend : $(CXXFILES) $(CFILES) +ifeq ($(OS),IRIX) touch $@ else -ifeq (0,1) # This is an experiment - @ [ -d depend ] || mkdir depend - @ rm -f $@; - for f in $?; do \ - ff=`basename $$f`;\ - $(C++) $(INC) $(DEPARG) > depend/$$ff ;\ - echo "include depend/$$ff" >> $@;\ - done -else - $(C++) $(INC) $(DEPARG) $^ > $(MAKEDEPEND) + @ touch $@ + @if [ ! -d .depend ] ; 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;\ + fi endif + + +ifeq (0,1) ##### OLD WAY : Keep until we've proven that this doesn't trip up + ##### on other OS's. + Makedepend : $(CXXFILES) $(CFILES) + ifeq ($(OS),IRIX) + touch $@ + else + ifeq (0,1) # This is an experiment + @ [ -d depend ] || mkdir depend + @ rm -f $@; + for f in $?; do \ + ff=`basename $$f`;\ + $(C++) $(INC) $(DEPARG) > depend/$$ff ;\ + echo "include depend/$$ff" >> $@;\ + done + else + $(C++) $(INC) $(DEPARG) $^ > $(MAKEDEPEND) + endif + endif + endif @@ -155,24 +186,6 @@ endif .cpp.o: $(C++) $(CXXFLAGS) -c $< -## This is an attempt at updating Makedepend file for each source -## file compiled rather than all files each time a source file changes -## Doesn't work too well, but leave the code here for later evaulation -ifeq (0,1) -ifneq ($(OS),IRIX) - $(C++) $(INC) $(DEPARG) $< > .temp.dep - if [ -f $(MAKEDEPEND) ] ; \ - then \ - grep -v $< $(MAKEDEPEND) > .temp.dep1;\ - else \ - touch .temp.dep1; \ - fi - cat .temp.dep1 .temp.dep > $(MAKEDEPEND) - rm -f .temp.dep1 .temp.dep -endif -endif - - depend : $(MAKEDEPEND) diff --git a/dist/Irix/GNUmakefile b/dist/Irix/GNUmakefile new file mode 100644 index 000000000..201c0d515 --- /dev/null +++ b/dist/Irix/GNUmakefile @@ -0,0 +1,16 @@ +SHELL = /bin/sh + + +all : irixdist tardist + + +irixdist : + cd ${OSGHOME}; [ -d irixdist ] || mkdir irixdist + cd ${OSGHOME}; \ + /usr/sbin/gendist -sbase ${OSGHOME} -idb dist/Irix/osg.idb -spec dist/Irix/osg.spec -dist irixdist -all + + +tardist : irixdist + cd ${OSGHOME}/irixdist;\ + tar cvf osg.tardist osg osg.idb osg.sw + diff --git a/examples/Makefile b/examples/GNUmakefile similarity index 100% rename from examples/Makefile rename to examples/GNUmakefile diff --git a/examples/osgcameragroup/Makefile b/examples/osgcameragroup/GNUmakefile similarity index 100% rename from examples/osgcameragroup/Makefile rename to examples/osgcameragroup/GNUmakefile diff --git a/examples/osgcameragroup/Makefile.inst b/examples/osgcameragroup/GNUmakefile.inst similarity index 100% rename from examples/osgcameragroup/Makefile.inst rename to examples/osgcameragroup/GNUmakefile.inst diff --git a/examples/osgconv/Makefile b/examples/osgconv/GNUmakefile similarity index 100% rename from examples/osgconv/Makefile rename to examples/osgconv/GNUmakefile diff --git a/examples/osgconv/Makefile.inst b/examples/osgconv/GNUmakefile.inst similarity index 100% rename from examples/osgconv/Makefile.inst rename to examples/osgconv/GNUmakefile.inst diff --git a/examples/osghud/Makefile.inst b/examples/osghud/GNUmakefile.inst similarity index 100% rename from examples/osghud/Makefile.inst rename to examples/osghud/GNUmakefile.inst diff --git a/examples/osghud/Makefile b/examples/osghud/Makefile deleted file mode 100644 index 41ca2a458..000000000 --- a/examples/osghud/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -TOPDIR = ../.. -include $(TOPDIR)/Make/makedefs - -CXXFILES =\ - osghud.cpp\ - -LIBS += -losgProducer -lProducer -losgText $(OSG_LIBS) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) - -INSTFILES = \ - $(CXXFILES)\ - Makefile.inst=Makefile - -EXEC = osghud - -CXXFLAGS += $(PRODUCER_INCLUDE_DIR) -LDFLAGS += $(PRODUCER_LIB_DIR) - -include $(TOPDIR)/Make/makerules - diff --git a/examples/osgreflect/Makefile b/examples/osgreflect/GNUmakefile similarity index 100% rename from examples/osgreflect/Makefile rename to examples/osgreflect/GNUmakefile diff --git a/examples/osgreflect/Makefile.inst b/examples/osgreflect/GNUmakefile.inst similarity index 100% rename from examples/osgreflect/Makefile.inst rename to examples/osgreflect/GNUmakefile.inst diff --git a/examples/osgstereoimage/Makefile b/examples/osgstereoimage/GNUmakefile similarity index 100% rename from examples/osgstereoimage/Makefile rename to examples/osgstereoimage/GNUmakefile diff --git a/examples/osgstereoimage/Makefile.inst b/examples/osgstereoimage/GNUmakefile.inst similarity index 100% rename from examples/osgstereoimage/Makefile.inst rename to examples/osgstereoimage/GNUmakefile.inst diff --git a/examples/osgtext/Makefile b/examples/osgtext/GNUmakefile similarity index 100% rename from examples/osgtext/Makefile rename to examples/osgtext/GNUmakefile diff --git a/examples/osgtext/Makefile.inst b/examples/osgtext/GNUmakefile.inst similarity index 100% rename from examples/osgtext/Makefile.inst rename to examples/osgtext/GNUmakefile.inst diff --git a/examples/osgviewer/Makefile b/examples/osgviewer/GNUmakefile similarity index 100% rename from examples/osgviewer/Makefile rename to examples/osgviewer/GNUmakefile diff --git a/examples/osgviewer/Makefile.inst b/examples/osgviewer/GNUmakefile.inst similarity index 100% rename from examples/osgviewer/Makefile.inst rename to examples/osgviewer/GNUmakefile.inst diff --git a/src/Demos/Makefile b/src/Demos/GNUmakefile similarity index 100% rename from src/Demos/Makefile rename to src/Demos/GNUmakefile diff --git a/src/Demos/osganimate/Makefile b/src/Demos/osganimate/GNUmakefile similarity index 100% rename from src/Demos/osganimate/Makefile rename to src/Demos/osganimate/GNUmakefile diff --git a/src/Demos/osganimate/Makefile.inst b/src/Demos/osganimate/GNUmakefile.inst similarity index 100% rename from src/Demos/osganimate/Makefile.inst rename to src/Demos/osganimate/GNUmakefile.inst diff --git a/src/Demos/osgbillboard/Makefile b/src/Demos/osgbillboard/GNUmakefile similarity index 100% rename from src/Demos/osgbillboard/Makefile rename to src/Demos/osgbillboard/GNUmakefile diff --git a/src/Demos/osgbillboard/Makefile.inst b/src/Demos/osgbillboard/GNUmakefile.inst similarity index 100% rename from src/Demos/osgbillboard/Makefile.inst rename to src/Demos/osgbillboard/GNUmakefile.inst diff --git a/src/Demos/osgcallback/Makefile b/src/Demos/osgcallback/GNUmakefile similarity index 100% rename from src/Demos/osgcallback/Makefile rename to src/Demos/osgcallback/GNUmakefile diff --git a/src/Demos/osgcallback/Makefile.inst b/src/Demos/osgcallback/GNUmakefile.inst similarity index 100% rename from src/Demos/osgcallback/Makefile.inst rename to src/Demos/osgcallback/GNUmakefile.inst diff --git a/src/Demos/osgclip/Makefile b/src/Demos/osgclip/GNUmakefile similarity index 100% rename from src/Demos/osgclip/Makefile rename to src/Demos/osgclip/GNUmakefile diff --git a/src/Demos/osgclip/Makefile.inst b/src/Demos/osgclip/GNUmakefile.inst similarity index 100% rename from src/Demos/osgclip/Makefile.inst rename to src/Demos/osgclip/GNUmakefile.inst diff --git a/src/Demos/osgcluster/Makefile b/src/Demos/osgcluster/GNUmakefile similarity index 100% rename from src/Demos/osgcluster/Makefile rename to src/Demos/osgcluster/GNUmakefile diff --git a/src/Demos/osgcluster/Makefile.inst b/src/Demos/osgcluster/GNUmakefile.inst similarity index 100% rename from src/Demos/osgcluster/Makefile.inst rename to src/Demos/osgcluster/GNUmakefile.inst diff --git a/src/Demos/osgconv/Makefile b/src/Demos/osgconv/GNUmakefile similarity index 100% rename from src/Demos/osgconv/Makefile rename to src/Demos/osgconv/GNUmakefile diff --git a/src/Demos/osgconv/Makefile.inst b/src/Demos/osgconv/GNUmakefile.inst similarity index 100% rename from src/Demos/osgconv/Makefile.inst rename to src/Demos/osgconv/GNUmakefile.inst diff --git a/src/Demos/osgcopy/Makefile b/src/Demos/osgcopy/GNUmakefile similarity index 100% rename from src/Demos/osgcopy/Makefile rename to src/Demos/osgcopy/GNUmakefile diff --git a/src/Demos/osgcopy/Makefile.inst b/src/Demos/osgcopy/GNUmakefile.inst similarity index 100% rename from src/Demos/osgcopy/Makefile.inst rename to src/Demos/osgcopy/GNUmakefile.inst diff --git a/src/Demos/osgcube/Makefile b/src/Demos/osgcube/GNUmakefile similarity index 100% rename from src/Demos/osgcube/Makefile rename to src/Demos/osgcube/GNUmakefile diff --git a/src/Demos/osgcube/Makefile.inst b/src/Demos/osgcube/GNUmakefile.inst similarity index 100% rename from src/Demos/osgcube/Makefile.inst rename to src/Demos/osgcube/GNUmakefile.inst diff --git a/src/Demos/osgcubemap/Makefile b/src/Demos/osgcubemap/GNUmakefile similarity index 100% rename from src/Demos/osgcubemap/Makefile rename to src/Demos/osgcubemap/GNUmakefile diff --git a/src/Demos/osgcubemap/Makefile.inst b/src/Demos/osgcubemap/GNUmakefile.inst similarity index 100% rename from src/Demos/osgcubemap/Makefile.inst rename to src/Demos/osgcubemap/GNUmakefile.inst diff --git a/src/Demos/osggeodemo/Makefile b/src/Demos/osggeodemo/GNUmakefile similarity index 100% rename from src/Demos/osggeodemo/Makefile rename to src/Demos/osggeodemo/GNUmakefile diff --git a/src/Demos/osggeodemo/Makefile.inst b/src/Demos/osggeodemo/GNUmakefile.inst similarity index 100% rename from src/Demos/osggeodemo/Makefile.inst rename to src/Demos/osggeodemo/GNUmakefile.inst diff --git a/src/Demos/osggeometry/Makefile b/src/Demos/osggeometry/GNUmakefile similarity index 100% rename from src/Demos/osggeometry/Makefile rename to src/Demos/osggeometry/GNUmakefile diff --git a/src/Demos/osggeometry/Makefile.inst b/src/Demos/osggeometry/GNUmakefile.inst similarity index 100% rename from src/Demos/osggeometry/Makefile.inst rename to src/Demos/osggeometry/GNUmakefile.inst diff --git a/src/Demos/osghangglide/Makefile b/src/Demos/osghangglide/GNUmakefile similarity index 100% rename from src/Demos/osghangglide/Makefile rename to src/Demos/osghangglide/GNUmakefile diff --git a/src/Demos/osghangglide/Makefile.inst b/src/Demos/osghangglide/GNUmakefile.inst similarity index 100% rename from src/Demos/osghangglide/Makefile.inst rename to src/Demos/osghangglide/GNUmakefile.inst diff --git a/src/Demos/osghud/Makefile b/src/Demos/osghud/GNUmakefile similarity index 100% rename from src/Demos/osghud/Makefile rename to src/Demos/osghud/GNUmakefile diff --git a/src/Demos/osghud/Makefile.inst b/src/Demos/osghud/GNUmakefile.inst similarity index 100% rename from src/Demos/osghud/Makefile.inst rename to src/Demos/osghud/GNUmakefile.inst diff --git a/src/Demos/osgimpostor/Makefile b/src/Demos/osgimpostor/GNUmakefile similarity index 100% rename from src/Demos/osgimpostor/Makefile rename to src/Demos/osgimpostor/GNUmakefile diff --git a/src/Demos/osgimpostor/Makefile.inst b/src/Demos/osgimpostor/GNUmakefile.inst similarity index 100% rename from src/Demos/osgimpostor/Makefile.inst rename to src/Demos/osgimpostor/GNUmakefile.inst diff --git a/src/Demos/osglight/Makefile b/src/Demos/osglight/GNUmakefile similarity index 100% rename from src/Demos/osglight/Makefile rename to src/Demos/osglight/GNUmakefile diff --git a/src/Demos/osglight/Makefile.inst b/src/Demos/osglight/GNUmakefile.inst similarity index 100% rename from src/Demos/osglight/Makefile.inst rename to src/Demos/osglight/GNUmakefile.inst diff --git a/src/Demos/osglightpoint/Makefile b/src/Demos/osglightpoint/GNUmakefile similarity index 100% rename from src/Demos/osglightpoint/Makefile rename to src/Demos/osglightpoint/GNUmakefile diff --git a/src/Demos/osglightpoint/Makefile.inst b/src/Demos/osglightpoint/GNUmakefile.inst similarity index 100% rename from src/Demos/osglightpoint/Makefile.inst rename to src/Demos/osglightpoint/GNUmakefile.inst diff --git a/src/Demos/osglogo/Makefile b/src/Demos/osglogo/GNUmakefile similarity index 100% rename from src/Demos/osglogo/Makefile rename to src/Demos/osglogo/GNUmakefile diff --git a/src/Demos/osglogo/Makefile.inst b/src/Demos/osglogo/GNUmakefile.inst similarity index 100% rename from src/Demos/osglogo/Makefile.inst rename to src/Demos/osglogo/GNUmakefile.inst diff --git a/src/Demos/osgmultitexture/Makefile b/src/Demos/osgmultitexture/GNUmakefile similarity index 100% rename from src/Demos/osgmultitexture/Makefile rename to src/Demos/osgmultitexture/GNUmakefile diff --git a/src/Demos/osgmultitexture/Makefile.inst b/src/Demos/osgmultitexture/GNUmakefile.inst similarity index 100% rename from src/Demos/osgmultitexture/Makefile.inst rename to src/Demos/osgmultitexture/GNUmakefile.inst diff --git a/src/Demos/osgmultitexture/osgmultitexture.cpp b/src/Demos/osgmultitexture/osgmultitexture.cpp index 54937a62a..7b7c00978 100644 --- a/src/Demos/osgmultitexture/osgmultitexture.cpp +++ b/src/Demos/osgmultitexture/osgmultitexture.cpp @@ -112,8 +112,6 @@ int main( int argc, char **argv ) osg::notify(osg::NOTICE)<<"unable to load reflect map, model will not be mutlitextured"< #include #include @@ -317,7 +318,7 @@ void ArgumentParser::writeErrorMessages(std::ostream& output,ErrorSeverity sever { if (itr->second>=severity) { - output<first<first << std::endl; } } } diff --git a/src/osg/Makefile b/src/osg/GNUmakefile similarity index 100% rename from src/osg/Makefile rename to src/osg/GNUmakefile diff --git a/src/osgDB/Makefile b/src/osgDB/GNUmakefile similarity index 100% rename from src/osgDB/Makefile rename to src/osgDB/GNUmakefile diff --git a/src/osgGA/Makefile b/src/osgGA/GNUmakefile similarity index 100% rename from src/osgGA/Makefile rename to src/osgGA/GNUmakefile diff --git a/src/osgGLUT/Makefile b/src/osgGLUT/GNUmakefile similarity index 100% rename from src/osgGLUT/Makefile rename to src/osgGLUT/GNUmakefile diff --git a/src/osgParticle/Makefile b/src/osgParticle/GNUmakefile similarity index 100% rename from src/osgParticle/Makefile rename to src/osgParticle/GNUmakefile diff --git a/src/osgPlugins/Makefile b/src/osgPlugins/GNUmakefile similarity index 100% rename from src/osgPlugins/Makefile rename to src/osgPlugins/GNUmakefile diff --git a/src/osgPlugins/ac3d/Makefile b/src/osgPlugins/ac3d/GNUmakefile similarity index 100% rename from src/osgPlugins/ac3d/Makefile rename to src/osgPlugins/ac3d/GNUmakefile diff --git a/src/osgPlugins/bmp/Makefile b/src/osgPlugins/bmp/GNUmakefile similarity index 100% rename from src/osgPlugins/bmp/Makefile rename to src/osgPlugins/bmp/GNUmakefile diff --git a/src/osgPlugins/directx/Makefile b/src/osgPlugins/directx/GNUmakefile similarity index 100% rename from src/osgPlugins/directx/Makefile rename to src/osgPlugins/directx/GNUmakefile diff --git a/src/osgPlugins/dw/Makefile b/src/osgPlugins/dw/GNUmakefile similarity index 100% rename from src/osgPlugins/dw/Makefile rename to src/osgPlugins/dw/GNUmakefile diff --git a/src/osgPlugins/dx/Makefile b/src/osgPlugins/dx/GNUmakefile similarity index 100% rename from src/osgPlugins/dx/Makefile rename to src/osgPlugins/dx/GNUmakefile diff --git a/src/osgPlugins/flt/Makefile b/src/osgPlugins/flt/GNUmakefile similarity index 100% rename from src/osgPlugins/flt/Makefile rename to src/osgPlugins/flt/GNUmakefile diff --git a/src/osgPlugins/freetype/Makefile b/src/osgPlugins/freetype/GNUmakefile similarity index 100% rename from src/osgPlugins/freetype/Makefile rename to src/osgPlugins/freetype/GNUmakefile diff --git a/src/osgPlugins/geo/Makefile b/src/osgPlugins/geo/GNUmakefile similarity index 100% rename from src/osgPlugins/geo/Makefile rename to src/osgPlugins/geo/GNUmakefile diff --git a/src/osgPlugins/gif/Makefile b/src/osgPlugins/gif/GNUmakefile similarity index 100% rename from src/osgPlugins/gif/Makefile rename to src/osgPlugins/gif/GNUmakefile diff --git a/src/osgPlugins/iv/Makefile b/src/osgPlugins/iv/GNUmakefile similarity index 100% rename from src/osgPlugins/iv/Makefile rename to src/osgPlugins/iv/GNUmakefile diff --git a/src/osgPlugins/iv/Makefile.orig b/src/osgPlugins/iv/GNUmakefile.orig similarity index 100% rename from src/osgPlugins/iv/Makefile.orig rename to src/osgPlugins/iv/GNUmakefile.orig diff --git a/src/osgPlugins/jpeg/Makefile b/src/osgPlugins/jpeg/GNUmakefile similarity index 100% rename from src/osgPlugins/jpeg/Makefile rename to src/osgPlugins/jpeg/GNUmakefile diff --git a/src/osgPlugins/lib3ds/Makefile b/src/osgPlugins/lib3ds/GNUmakefile similarity index 100% rename from src/osgPlugins/lib3ds/Makefile rename to src/osgPlugins/lib3ds/GNUmakefile diff --git a/src/osgPlugins/logos/Makefile b/src/osgPlugins/logos/GNUmakefile similarity index 100% rename from src/osgPlugins/logos/Makefile rename to src/osgPlugins/logos/GNUmakefile diff --git a/src/osgPlugins/lwo/Makefile b/src/osgPlugins/lwo/GNUmakefile similarity index 100% rename from src/osgPlugins/lwo/Makefile rename to src/osgPlugins/lwo/GNUmakefile diff --git a/src/osgPlugins/md2/Makefile b/src/osgPlugins/md2/GNUmakefile similarity index 100% rename from src/osgPlugins/md2/Makefile rename to src/osgPlugins/md2/GNUmakefile diff --git a/src/osgPlugins/obj/Makefile b/src/osgPlugins/obj/GNUmakefile similarity index 100% rename from src/osgPlugins/obj/Makefile rename to src/osgPlugins/obj/GNUmakefile diff --git a/src/osgPlugins/osg/Makefile b/src/osgPlugins/osg/GNUmakefile similarity index 100% rename from src/osgPlugins/osg/Makefile rename to src/osgPlugins/osg/GNUmakefile diff --git a/src/osgPlugins/osgParticle/Makefile b/src/osgPlugins/osgParticle/GNUmakefile similarity index 100% rename from src/osgPlugins/osgParticle/Makefile rename to src/osgPlugins/osgParticle/GNUmakefile diff --git a/src/osgPlugins/osgText/Makefile b/src/osgPlugins/osgText/GNUmakefile similarity index 100% rename from src/osgPlugins/osgText/Makefile rename to src/osgPlugins/osgText/GNUmakefile diff --git a/src/osgPlugins/osgtgz/Makefile b/src/osgPlugins/osgtgz/GNUmakefile similarity index 100% rename from src/osgPlugins/osgtgz/Makefile rename to src/osgPlugins/osgtgz/GNUmakefile diff --git a/src/osgPlugins/pfb/Makefile b/src/osgPlugins/pfb/GNUmakefile similarity index 100% rename from src/osgPlugins/pfb/Makefile rename to src/osgPlugins/pfb/GNUmakefile diff --git a/src/osgPlugins/pic/Makefile b/src/osgPlugins/pic/GNUmakefile similarity index 100% rename from src/osgPlugins/pic/Makefile rename to src/osgPlugins/pic/GNUmakefile diff --git a/src/osgPlugins/png/Makefile b/src/osgPlugins/png/GNUmakefile similarity index 100% rename from src/osgPlugins/png/Makefile rename to src/osgPlugins/png/GNUmakefile diff --git a/src/osgPlugins/quicktime/Makefile b/src/osgPlugins/quicktime/GNUmakefile similarity index 100% rename from src/osgPlugins/quicktime/Makefile rename to src/osgPlugins/quicktime/GNUmakefile diff --git a/src/osgPlugins/rgb/Makefile b/src/osgPlugins/rgb/GNUmakefile similarity index 100% rename from src/osgPlugins/rgb/Makefile rename to src/osgPlugins/rgb/GNUmakefile diff --git a/src/osgPlugins/tga/Makefile b/src/osgPlugins/tga/GNUmakefile similarity index 100% rename from src/osgPlugins/tga/Makefile rename to src/osgPlugins/tga/GNUmakefile diff --git a/src/osgPlugins/tgz/Makefile b/src/osgPlugins/tgz/GNUmakefile similarity index 100% rename from src/osgPlugins/tgz/Makefile rename to src/osgPlugins/tgz/GNUmakefile diff --git a/src/osgPlugins/tiff/Makefile b/src/osgPlugins/tiff/GNUmakefile similarity index 100% rename from src/osgPlugins/tiff/Makefile rename to src/osgPlugins/tiff/GNUmakefile diff --git a/src/osgPlugins/txp/Makefile b/src/osgPlugins/txp/GNUmakefile similarity index 100% rename from src/osgPlugins/txp/Makefile rename to src/osgPlugins/txp/GNUmakefile diff --git a/src/osgPlugins/zip/Makefile b/src/osgPlugins/zip/GNUmakefile similarity index 100% rename from src/osgPlugins/zip/Makefile rename to src/osgPlugins/zip/GNUmakefile diff --git a/src/osgProducer/Makefile b/src/osgProducer/GNUmakefile similarity index 100% rename from src/osgProducer/Makefile rename to src/osgProducer/GNUmakefile diff --git a/src/osgSim/Makefile b/src/osgSim/GNUmakefile similarity index 100% rename from src/osgSim/Makefile rename to src/osgSim/GNUmakefile diff --git a/src/osgText/Makefile b/src/osgText/GNUmakefile similarity index 100% rename from src/osgText/Makefile rename to src/osgText/GNUmakefile diff --git a/src/osgUtil/Makefile b/src/osgUtil/GNUmakefile similarity index 100% rename from src/osgUtil/Makefile rename to src/osgUtil/GNUmakefile