From 693a889ece60833d832eb2656f06229aa2793dd1 Mon Sep 17 00:00:00 2001 From: Don BURNS Date: Thu, 13 Mar 2003 02:53:40 +0000 Subject: [PATCH] Various changes to the BUILD system: o Object files now go in subdirectories named $(OS)$(ARCH).Opt and $(OS)$(ARCH).Debug for OS's that support both architectures. eg. Linux32.Opt and Linux32.Debug o Libraries links are now placed in lib/$(OS)$(ARCH) eg. lib/Linux32/ o Binaries are now placed in bin/$(OS)$(ARCH) eg. bin/Linux32 o 'make install' and 'make instlinks' now place files/links in /usr/local/{include,lib,share/OpenSceneGraph} by default on most systems (Solaris still goes in /opt/OpenSceneGraph). Rather than having the somwehat confusing INST_SYS_PREFIX and INST_SHARE_PREFX, you can override these with just INST_LOCATION For example, make INST_LOCATION=/usr will place files at /usr/include, /usr/lib, /usr/share/OpenSceneGraph. --- Make/dolink.sh | 66 ++++++++ Make/help.sh | 20 ++- Make/helprules | 2 +- Make/instdemosrc | 7 +- Make/instrules | 31 +--- Make/makedefs | 216 +++++++++++++------------ Make/makerules | 127 ++++----------- examples/osgcameragroup/GNUmakefile | 2 +- examples/osghud/GNUmakefile | 2 +- examples/osgreflect/GNUmakefile | 2 +- examples/osgstereoimage/GNUmakefile | 2 +- examples/osgtext/GNUmakefile | 2 +- examples/osgviewer/GNUmakefile | 2 +- src/Demos/osganimate/GNUmakefile | 2 +- src/Demos/osgbillboard/GNUmakefile | 2 +- src/Demos/osgcallback/GNUmakefile | 2 +- src/Demos/osgclip/GNUmakefile | 2 +- src/Demos/osgcluster/GNUmakefile | 2 +- src/Demos/osgconv/GNUmakefile | 2 +- src/Demos/osgcopy/GNUmakefile | 2 +- src/Demos/osgcube/GNUmakefile | 2 +- src/Demos/osgcubemap/GNUmakefile | 2 +- src/Demos/osggeodemo/GNUmakefile | 2 +- src/Demos/osggeometry/GNUmakefile | 2 +- src/Demos/osghangglide/GNUmakefile | 2 +- src/Demos/osghud/GNUmakefile | 2 +- src/Demos/osgimpostor/GNUmakefile | 2 +- src/Demos/osglight/GNUmakefile | 2 +- src/Demos/osglightpoint/GNUmakefile | 2 +- src/Demos/osglogo/GNUmakefile | 2 +- src/Demos/osgmultitexture/GNUmakefile | 2 +- src/Demos/osgoccluder/GNUmakefile | 2 +- src/Demos/osgparticle/GNUmakefile | 2 +- src/Demos/osgprerender/GNUmakefile | 2 +- src/Demos/osgreflect/GNUmakefile | 2 +- src/Demos/osgscribe/GNUmakefile | 2 +- src/Demos/osgsequence/GNUmakefile | 2 +- src/Demos/osgshadowtexture/GNUmakefile | 2 +- src/Demos/osgshape/GNUmakefile | 2 +- src/Demos/osgstereoimage/GNUmakefile | 2 +- src/Demos/osgteapot/GNUmakefile | 2 +- src/Demos/osgtext/GNUmakefile | 2 +- src/Demos/osgtexture1D/GNUmakefile | 2 +- src/Demos/osgtexture2D/GNUmakefile | 2 +- src/Demos/osgtexture3D/GNUmakefile | 2 +- src/Demos/osgunittests/GNUmakefile | 2 +- src/Demos/osgversion/GNUmakefile | 2 +- src/Demos/osgvertexprogram/GNUmakefile | 2 +- src/Demos/osgviews/GNUmakefile | 2 +- src/Demos/sgv/GNUmakefile | 2 +- 50 files changed, 269 insertions(+), 286 deletions(-) create mode 100644 Make/dolink.sh diff --git a/Make/dolink.sh b/Make/dolink.sh new file mode 100644 index 000000000..c0716138b --- /dev/null +++ b/Make/dolink.sh @@ -0,0 +1,66 @@ +#!/bin/sh + +bye() +{ + echo $1 + exit 1 +} + +TOPDIR=$1 +LNSRC=$2 +LNDEST=$3 +LINKCMD=$4 + +## Check command line + + +[ $# -lt 4 ] && bye "Usage: $0 " + +## Check for existence of link source file +[ -n "$LNSRC" ] || bye "Internal error (LNSRC definition)" + +## Check for existence of link destination file +[ -n "$LNDEST" ] || bye "Internal error (LNDEST definition)" + +if diff -s $TOPDIR/$LNDEST $LNSRC >/dev/null 2>&1 +then + echo " =====> $LNSRC and $TOPDIR/$LNDEST are in sync" +else + echo " =====> resetting $TOPDIR/$LNDEST to point to $LNSRC" + + ## At this point, we must create a link at the link destination + ## which points back to our link source. This requires us to + ## build a path FROM the destination back to the source + + #1) Get the source directory as an absolute path + SRCDIR=`pwd`/`dirname $LNSRC` + + #2) Get the destination directory as an absolute path (TOPDIR is + ## a relative path from the current directory). + cd $TOPDIR + ROOTDIR=`pwd` + DESTDIR=`dirname "$ROOTDIR"/"$LNDEST"` + + #3) Build a ../../ chain from the destination directory to the + ## current directory (ROOTDIR), which will become the prefix to + ## the path + T=`dirname $LNDEST` + while [ "$T" != "." ] + do + T=`dirname $T`;PFX=../"$PFX" + done + + #4) strip the absolute path prefix of SRCDIR leading to the current + ## directory, so we are left with the relative path from the current + ## directory to the link source directory. Prefix that with PFX. + LINK="$PFX"`echo $SRCDIR $ROOTDIR | awk '{ print substr($1,length($2)+2,512) }'`/`basename $LNDEST` + + #5) Create the links by changing to the destination directory, + ## removing any old versions of the link and creating a new one + [ -d `dirname $LNDEST` ] || mkdir -p `dirname $LNDEST` + cd `dirname $LNDEST` + rm -f `basename $LNDEST` + $LINKCMD $LINK `basename $LNDEST` +fi + +exit 0 diff --git a/Make/help.sh b/Make/help.sh index 139bf66fa..e563837d9 100644 --- a/Make/help.sh +++ b/Make/help.sh @@ -45,8 +45,8 @@ and optimized version of targets reside in parallel. builds. -Solars and IRIX can build 64 bit targets. These require the ARCH=64 argument. -For example: +Solaris, IRIX and Linux (some compilers) can build 64 bit targets. These +require the ARCH=64 argument. For example: make ARCH=64 - Same as 'make ARCH=64 opt' make ARCH=64 opt - Builds 64 bit optimized targets @@ -116,13 +116,14 @@ installation locations for $OS. demo source code in and documentation in -Note also that INST_LIBS, INST_PLUGINS, and INST_INCLUDE share a common -prefix by default: INST_SYS_PREFIX. Further INST_DEMOS, INST_DEMOS_SRC, -INST_DOC, and INST_DATA share a common prefix by default : INST_SHARE_PREFIX. -This provides a short cut for the above 'make' usage. For example, +Note also that INST_LIBS, INST_PLUGINS, INST_INCLUDE, and INST_SHARE share +a common prefix by default: INST_LOCATION. Further INST_DEMOS, INST_DEMOS_SRC, +INST_DOC, and INST_DATA share a common prefix by default : INST_SHARE, which +is located under INST_LOCATION by default. This provides a short cut for the +above 'make' usage. For example, - make INST_SYS_PREFIX=/usr/local/OpenSceneGraph \\ - INST_SHARE_PREFIX=/usr/share/OpenSceneGraph \\ + make INST_LOCATION=/usr/local/OpenSceneGraph \\ + INST_SHARE=/usr/share/OpenSceneGraph \\ install @@ -147,9 +148,6 @@ using OSG headers add to your -I compile flags: $INST_INCLUDE - - - EOF exit 0 diff --git a/Make/helprules b/Make/helprules index c38529d81..42b210c44 100644 --- a/Make/helprules +++ b/Make/helprules @@ -1,5 +1,5 @@ help: - $(TOPDIR)/Make/help.sh\ + @$(TOPDIR)/Make/help.sh\ $(OS)\ $(TOPDIR)\ $(INST_LIBS)\ diff --git a/Make/instdemosrc b/Make/instdemosrc index d9c43013b..c69168be8 100755 --- a/Make/instdemosrc +++ b/Make/instdemosrc @@ -31,12 +31,13 @@ copy_demo_source() THISDIR=`pwd` cd $TOPDIR/src/Demos/$d [ -d $INST_DEMO_SRC/$d ] || mkdir -m 0755 -p $INST_DEMO_SRC/$d - for f in `gmake __instfiles | grep -v make ` - do + echo " installing $d" + for f in `gmake __instfiles | grep -v gmake` + do src=`echo $f | cut -f1 -d"="` dst=`echo $f | cut -f2 -d"="` if [ -z "$dst" ] ; then dst=$src; fi - echo $INSTALLCMD `pwd`/$src $INST_DEMO_SRC/$d/$dst + ###echo $INSTALLCMD `pwd`/$src $INST_DEMO_SRC/$d/$dst $INSTALLCMD `pwd`/$src $INST_DEMO_SRC/$d/$dst done cd $THISDIR diff --git a/Make/instrules b/Make/instrules index 126227c64..b9452db7e 100644 --- a/Make/instrules +++ b/Make/instrules @@ -7,11 +7,11 @@ instbin instdev : @$(MAKE) __$@ __instbin: - @$(MAKE) INSTSRC=$(TOPDIR)/bin INSTDEST=$(INST_DEMOS) \ + @$(MAKE) INSTSRC=$(TOPDIR)/bin/$(OS)$(ARCH) INSTDEST=$(INST_DEMOS) \ INSTALL?="$(INSTBINCMD)" __install - @$(MAKE) INSTSRC=$(TOPDIR)/lib INSTDEST=$(INST_LIBS) \ + @$(MAKE) INSTSRC=$(TOPDIR)/lib/$(OS)$(ARCH) INSTDEST=$(INST_LIBS) \ INSTALL?="$(INSTBINCMD)" __install - @$(MAKE) INSTSRC=$(TOPDIR)/lib/osgPlugins INSTDEST=$(INST_PLUGINS)\ + @$(MAKE) INSTSRC=$(TOPDIR)/lib/$(OS)$(ARCH)/osgPlugins INSTDEST=$(INST_PLUGINS)\ INSTALL?="$(INSTBINCMD)" __install @echo >> $(INSTLOGFILE) @echo " Run-time environment installation successful. Add "\ @@ -69,9 +69,6 @@ __instdev: >> $(INSTLOGFILE) @echo >> $(INSTLOGFILE) - - - instlinks : @rm -f $(INSTLOGFILE) $(MAKE) INSTBINCMD="$(INSTLINKBINCMD)" __instbin @@ -92,11 +89,11 @@ instlinksdev : instclean : instcleanbin instcleandev instcleanbin : - @$(MAKE) INSTSRC=$(TOPDIR)/bin INSTDEST=$(INST_DEMOS) \ + @$(MAKE) INSTSRC=$(TOPDIR)/bin/$(OS)$(ARCH) INSTDEST=$(INST_DEMOS) \ INSTALL?="$(INSTBINCMD)" __instclean - @$(MAKE) INSTSRC=$(TOPDIR)/lib INSTDEST=$(INST_LIBS) \ + @$(MAKE) INSTSRC=$(TOPDIR)/lib/$(OS)$(ARCH) INSTDEST=$(INST_LIBS) \ INSTALL?="$(INSTBINCMD)" __instclean - @$(MAKE) INSTSRC=$(TOPDIR)/lib/osgPlugins INSTDEST=$(INST_PLUGINS)\ + @$(MAKE) INSTSRC=$(TOPDIR)/lib/$(OS)$(ARCH)/osgPlugins INSTDEST=$(INST_PLUGINS)\ INSTALL?="$(INSTBINCMD)" __instclean instcleandev : @@ -131,27 +128,11 @@ __install : if [ -f $$f ] ; \ then \ INSTPATH=$$THISDIR/$$f; \ - echo $(INSTALL) $$INSTPATH $(INSTDEST)/$$f;\ $(INSTALL) $$INSTPATH $(INSTDEST)/$$f;\ fi\ done\ fi -# These lines cause instlinks to install links pointing to the actual files -# rather than the links in $(TOPDIR)/{bin,lib,include}. Advantage of this -# is for systems that hold multiple platforms in the same nfs mounted source -# but install different executables. Disadvantage is that it is not trivial -# to change to debug version by simply doing a 'make debug'. -# while [ -L $$INSTPATH ]; \ -# while `csh -f -c "test -L $$INSTPATH"` ;\ -# do \ -# ll=`ls -l $$INSTPATH | cut -f2 -d">"`;\ -# cd `dirname $$ll`;\ -# INSTPATH="`pwd`"/"`basename $$ll`";\ -# cd $$THISDIR;\ -# done;\ - - __instclean : @[ -n "$(INSTSRC)" ] || echo "Internal error (INSTSRC definition)" @[ -n "$(INSTSRC)" ] && echo > /dev/null diff --git a/Make/makedefs b/Make/makedefs index 2d73529c8..7729158cd 100644 --- a/Make/makedefs +++ b/Make/makedefs @@ -25,41 +25,53 @@ MAKEDEPEND = ignore INC = -I$(TOPDIR)/include DEF = +############################################################################ +## NOTE - Semantics for the use of ARCH, ARCHARGS, and ARCHINST parameters +## ARCH - must be defined if the OS supports both 64 and 32 bit +## architectures may remain undefined if it does not. +## ARCHARGS - Compiler directives to indicate for which architecture +## to build for +## ARCHINST - Installation target directory. Define if the OS supports +## more than one architecture (32 and 64). +## for ARCH=32 - define ARCHINST only if the system uses an +## extension on 'lib' to indicate 32 bit. e.g. +## IRIX defines /usr/lib32 +## for ARCH=64 - Always define ARCHINST. Even if the OS +## doesn't make a distinction, we will. +############################################################################ + CXXFLAGS = $(ARCHARGS) $(DOF) $(DEF) $(INC) -LDFLAGS = $(ARCHARGS) $(DOF) $(LINKARGS) -L$(TOPDIR)/lib +LDFLAGS = $(ARCHARGS) $(DOF) $(LINKARGS) -L$(TOPDIR)/lib/$(OS)$(ARCH) OBJS = $(C++FILES:.cpp=.o) \ - $(CXXFILES:.cpp=.o) \ - $(CFILES:.c=.o) \ + $(CXXFILES:.cpp=.o) \ + $(CFILES:.c=.o) \ DOF = $(OPTF) DEBUGDIR = $(OS)$(ARCH).Debug OPTDIR = $(OS)$(ARCH).Opt BININST = bin LIBINST = lib -PLUGININST = lib/osgPlugins +PLUGININST = lib/$(OS)$(ARCH)/osgPlugins -INST_SYS_PREFIX = /usr/local -INST_LIBS = $(INST_SYS_PREFIX)/lib$(ARCH) -INST_PLUGINS = $(INST_SYS_PREFIX)/lib$(ARCH)/osgPlugins -INST_INCLUDE = $(INST_SYS_PREFIX)/include -INST_SHARE_PREFIX = /usr/share -INST_DEMOS = $(INST_SHARE_PREFIX)/OpenSceneGraph/bin -INST_SRC = $(INST_SHARE_PREFIX)/OpenSceneGraph/src -INST_DOC = $(INST_SHARE_PREFIX)/OpenSceneGraph/doc -INST_DATA = $(INST_SHARE_PREFIX)/OpenSceneGraph/data -INST_DEMO_SRC = $(INST_SRC)/demos - -LINK = ln -sf -INSTBINCMD = install -m 755 -INSTDEVCMD = install -m 644 -INSTLINKBINCMD = $(LINK) -INSTLINKDEVCMD = $(LINK) - -LIB_PREFIX = lib +INST_LOCATION = /usr/local +INST_LIBS = $(INST_LOCATION)/lib$(ARCHINST) +INST_PLUGINS = $(INST_LOCATION)/lib$(ARCHINST)/osgPlugins +INST_INCLUDE = $(INST_LOCATION)/include +INST_SHARE = $(INST_LOCATION)/share +INST_DEMOS = $(INST_SHARE)/OpenSceneGraph/bin +INST_SRC = $(INST_SHARE)/OpenSceneGraph/src +INST_DOC = $(INST_SHARE)/OpenSceneGraph/doc +INST_DATA = $(INST_SHARE)/OpenSceneGraph/data +INST_DEMO_SRC = $(INST_SRC)/demos +LINK = ln -sf +INSTBINCMD = install -m 755 +INSTDEVCMD = install -m 644 +INSTLINKBINCMD = $(LINK) +INSTLINKDEVCMD = $(LINK) +LIB_PREFIX = lib LIB_EXT = so PLUGIN_PREFIX = osgdb_ PLUGIN_EXT = so - MAKEDIST = echo " === Distribution build is not implemented yet for $(OS)"; printf "\n" INSTLOGFILE = /tmp/.osg_inst_log @@ -87,7 +99,6 @@ ifeq ($(OS),SunOS) #### if useing g++ on a sun ifeq ($(COMPILER),gnu) - C++ = g++ DEPARG = -M INC += -I/usr/local/glut-3.7/include @@ -95,14 +106,16 @@ ifeq ($(OS),SunOS) OPTF = -O2 DBGF = -g -DOSG_COMPILE_UNIT_TESTS SHARED = -shared -fPIC + ARCH = 32 ifeq ($(ARCH),64) - ARCHARGS = -m64 -DARCH64 + ARCHARGS = -m64 -DARCH64 + ARCHINST = 64 else - ARCHARGS = + ARCHARGS = endif GLUT_LIB = -L/usr/local/glut-3.7/lib/glut -lglut GIF_LIBS = -lgif - TIFF_LIB = -ltiff + TIFF_LIB = -ltiff JPEG_LIBS = -ljpeg PNG_LIBS = -lpng -lz FREETYPE_LIB = -lfreetype @@ -110,79 +123,75 @@ ifeq ($(OS),SunOS) #### using forte compilers (default) else - C++ = CC DEPARG = -xM1 INC += - DEF += -features=extensions + DEF += -features=extensions -w OPTF = -xO4 DBGF = -g -DOSG_COMPILE_UNIT_TESTS SHARED = -G + ARCH = 32 ifeq ($(ARCH),64) - ARCHARGS = -xarch=v9 -DARCH64 + ARCHARGS = -xarch=v9 -DARCH64 + ARCHINST = 64 else - ARCHARGS = + ARCHARGS = + ARCHINST = endif GLUT_LIB = -lglut OTHER_LIBS = -lCstd LINKARGS = - GIF_LIBS = /usr/local/lib/libgif.a - TIFF_LIB = /usr/local/lib/libtiff.a + TIFF_LIB = /usr/local/lib/libtiff.a JPEG_LIBS = /usr/local/lib/libjpeg.a PNG_LIBS = /usr/local/lib/libpng.a /usr/local/lib/libz.a FREETYPE_LIB = /usr/local/lib/libfreetype.a - endif DYNAMICLIBRARYLIB = -ldl OSG_LIBS = -losgGLUT -losgGA -losgDB -losgUtil -losg - GL_LIBS = -lGLU -lGL X_LIBS = -lXext -lXmu -lXi -lX11 SOCKET_LIBS = -lsocket -lnsl - INSTBINCMD = cp INSTDEVCMD = cp - - INST_SYS_PREFIX = /opt/OpenSceneGraph - INST_SHARE_PREFIX = /opt - + INST_LOCATION = /opt/OpenSceneGraph MAKEDIST = $(TOPDIR)/Make/makepkg - endif #### IRIX Specific definitions ifeq ($(OS),IRIX) - - LINKARGS = -L${TOPDIR}/lib -LANG:std -OPT:Olimit=0 + LINKARGS = -L${TOPDIR}/lib -LANG:std -OPT:Olimit=0 C++ = CC DEPARG = -M INC += -I${TOPDIR}/include -I/usr/freeware/include DEF += -LANG:std -OPT:Olimit=0 \ - -DEBUG:woff=1682 -DEBUG:woff=3303\ - -MDupdate $(MAKEDEPEND) + -DEBUG:woff=1681 -DEBUG:woff=1682 -DEBUG:woff=3303\ + -MDupdate $(MAKEDEPEND) OPTF = -O2 DBGF = -g -DOSG_COMPILE_UNIT_TESTS SHARED = -shared - ARCH = 32 PFLIBS = \ -lpf3ds -lpfdem -lpfdted -lpfdwb -lpfdxf -lpfevt \ -lpfflt -lpfgds -lpfgfo -lpfim -lpflsa -lpflsb \ -lpfnff -lpfobj -lpfpegg -lpfpfb -lpfphd -lpfpts \ -lpfrot -lpfscale -lpfsgf -lpfsgo -lpfsphere -lpfsv \ -lpftri -lpfunc -lpfvct -lpfdu -lpfutil -lpf -all -limage - FREETYPE_LIB = -lfreetype -ifeq ($(ARCH),64) + FREETYPE_LIB = -lfreetype + ARCH = 32 + ifeq ($(ARCH),64) ARCHARGS = -64 -DARCH64 + ARCHINST = 64 LINKARGS += -L/usr/freeware/lib64 PF_XTRA_LIBS = -L/usr/lib64/libpfdb -rpath /usr/lib64/libpfdb \ - $(PFLIBS) -else + $(PFLIBS) + else ARCHARGS = -n32 + ARCHINST = 32 LINKARGS += -L/usr/freeware/lib32 PF_XTRA_LIBS = -L/usr/lib32/libpfdb -rpath /usr/lib32/libpfdb \ - $(PFLIBS) -endif + $(PFLIBS) + endif + DYNAMICLIBRARYLIB = OSG_LIBS = -losgGLUT -losgGA -losgDB -losgUtil -losg GLUT_LIB = -lglut @@ -194,38 +203,44 @@ endif JPEG_LIBS = -ljpeg TIFF_LIB = -ltiff GIF_LIBS = -lungif - MAKEDIST = $(TOPDIR)/Make/makeirixdist - endif #### Linux specific definitions ifeq ($(OS),Linux) -ifeq (x$(CXX),x) - C++ = g++ -else - C++ = $(CXX) -endif + ifeq (x$(CXX),x) + C++ = g++ + else + C++ = $(CXX) + endif + DEPARG = -M INC += -ifeq ($(COMPILER),intel) - C++ = ecc - LIBS = -lgcc_s - DEF += -KPIC - OPTF = -O2 - DBGF = -g -DOSG_COMPILE_UNIT_TESTS -else - LIBS = -lstdc++ - DEF += -W -Wall -fPIC - OPTF = -O2 - DBGF = -g -gstabs+ -DOSG_COMPILE_UNIT_TESTS -endif + + ifeq ($(COMPILER),intel) + C++ = ecc + LIBS = -lgcc_s + DEF += -KPIC + OPTF = -O2 + DBGF = -g -DOSG_COMPILE_UNIT_TESTS + else + LIBS = -lstdc++ + DEF += -W -Wall -fPIC + OPTF = -O2 + DBGF = -g -gstabs+ -DOSG_COMPILE_UNIT_TESTS + endif + SYSARCH := $(shell arch) -ifeq ($(SYSARCH),ia64) - ARCH = 64 -endif + ifeq ($(SYSARCH),ia64) + ARCH = 64 + ARCHINST = 64 + else + ARCH = 32 + ARCHINST = + endif + SHARED = -shared ARCHARGS = LINKARGS = -L/usr/X11R6/lib @@ -243,7 +258,6 @@ endif JPEG_LIBS = -ljpeg TIFF_LIB = -ltiff GIF_LIBS = -lungif - MAKEDIST = $(TOPDIR)/Make/makerpms endif @@ -256,6 +270,8 @@ ifeq ($(OS),FreeBSD) OPTF = -O2 DBGF = -g -DOSG_COMPILE_UNIT_TESTS SHARED = -shared + ARCH = + ARCHINST = ARCHARGS = LINKARGS = -L/usr/X11R6/lib -L/usr/local/lib -rpath /usr/local/lib DYNAMICLIBRARYLIB = @@ -266,10 +282,8 @@ ifeq ($(OS),FreeBSD) X_LIBS = -lXmu -lX11 SOCKET_LIBS = OTHER_LIBS = - - INST_SYS_PREFIX = /opt/X11R6 - INST_SHARE_PREFIX = /usr/share/OpenSceneGraph - + INST_LOCATION = /opt/X11R6 + INST_SHARE = /usr/share/OpenSceneGraph endif #### MacOS X specific definitions @@ -281,6 +295,8 @@ ifeq ($(OS),Darwin) DBGF = -g -DOSG_COMPILE_UNIT_TESTS DEPARG = -M $(DEF) SHARED = -shared + ARCH = + ARCHINST = ARCHARGS = LINKARGS = DYNAMICLIBRARYLIB = @@ -292,13 +308,13 @@ ifeq ($(OS),Darwin) X_LIBS = SOCKET_LIBS = OTHER_LIBS = -lm -lstdc++ -lobjc - LIB_EXT = dylib - QUICKTIME = -framework QuickTime $(CARBON_LIB) - TIFF_LIB = -ltiff - LIBVERSION = -dylib_current_version 0.9.1 + LIB_EXT = dylib + QUICKTIME = -framework QuickTime $(CARBON_LIB) + TIFF_LIB = -ltiff + LIBVERSION = -dylib_current_version 0.9.3 # Plugins which require external libs: gif jpeg png tiff osgText - PLUGIN_DIRS = bmp dw flt \ + PLUGIN_DIRS = bmp dw flt \ lib3ds logos lwo obj \ osg osgParticle osgtgz pic \ quicktime rgb tga tgz \ @@ -314,14 +330,14 @@ ifeq ($(OS),CYGWIN) OPTF = -O2 DBGF = -g -DOSG_COMPILE_UNIT_TESTS SHARED = -shared\ - -Wl,--export-all-symbols \ - -Wl,--output-def,lib$(TARGET_BASENAME).def \ - -Wl,--out-implib,$(TOPDIR)/lib/lib$(TARGET_BASENAME).dll.a \ - + -Wl,--export-all-symbols \ + -Wl,--output-def,lib$(TARGET_BASENAME).def \ + -Wl,--out-implib,$(TOPDIR)/lib/lib$(TARGET_BASENAME).dll.a \ + ARCH = + ARCHINST = ARCHARGS = LINKARGS = -W -Wall DYNAMICLIBRARYLIB = - OSG_LIBS = -losgGLUT -losgGA -losgDB -losgUtil -losg GL_LIBS = -lglu32 -lopengl32 GLUT_LIB = -lglut32 $(GL_LIBS) @@ -333,14 +349,10 @@ ifeq ($(OS),CYGWIN) GIF_LIBS = -lungif TIFF_LIB = -ltiff -lz -ljpeg FREETYPE_LIB = -lfreetype2 - - LIB_PREFIX = cyg LIB_EXT = dll PLUGIN_EXT = dll - LINK = cp -f - INST_SYS_PREFIX = /usr/local/OpenSceneGraph INST_LIBS = $(INST_SYS_PREFIX)/bin INST_PLUGINS = $(INST_SYS_PREFIX)/bin @@ -351,8 +363,6 @@ ifeq ($(OS),CYGWIN) INST_DEMO_SRC = $(INST_SHARE_PREFIX)/src/demos INST_DOC = $(INST_SHARE_PREFIX)/doc INST_DATA = $(INST_SHARE_PREFIX)/data - - endif #### Cygwin/Mingw specific definitions @@ -365,14 +375,14 @@ ifeq ($(OS),MINGW) OPTF = -O2 DBGF = -g -DOSG_COMPILE_UNIT_TESTS SHARED = -shared\ - -Wl,--export-all-symbols \ - -Wl,--output-def,lib$(TARGET_BASENAME).def \ - -Wl,--out-implib,$(TOPDIR)/lib/lib$(TARGET_BASENAME).dll.a \ - + -Wl,--export-all-symbols \ + -Wl,--output-def,lib$(TARGET_BASENAME).def \ + -Wl,--out-implib,$(TOPDIR)/lib/lib$(TARGET_BASENAME).dll.a \ + ARCH = + ARCHINST = ARCHARGS = LINKARGS = -W -Wall DYNAMICLIBRARYLIB = - OSG_LIBS = -losgGLUT -losgGA -losgDB -losgUtil -losg GL_LIBS = -lglu32 -lopengl32 GLUT_LIB = -lglut32 $(GL_LIBS) @@ -385,14 +395,11 @@ ifeq ($(OS),MINGW) TIFF_LIB = -ltiff -lz -ljpeg FREETYPE_LIB = -lfreetype - # LIB_PREFIX = cyg LIB_PREFIX = lib LIB_EXT = dll PLUGIN_EXT = dll - LINK = cp -f - INST_SYS_PREFIX = /usr/local/OpenSceneGraph INST_LIBS = $(INST_SYS_PREFIX)/bin INST_PLUGINS = $(INST_SYS_PREFIX)/bin @@ -403,7 +410,6 @@ ifeq ($(OS),MINGW) INST_DEMO_SRC = $(INST_SHARE_PREFIX)/src/demos INST_DOC = $(INST_SHARE_PREFIX)/doc INST_DATA = $(INST_SHARE_PREFIX)/data - endif #### HP-UX Specific definitions @@ -424,9 +430,11 @@ ifeq ($(OS),HP-UX) ifeq ($(ARCH),64) # not yet tested ARCHARGS = -march=2.0 -DARCH64 + ARCHINST = 64 else # at least my gcc 3.1 defaults to HP-PA RISC 1.1 ARCHARGS = + ARCHINST = endif LINKARGS = -lpthread LIB_EXT = sl diff --git a/Make/makerules b/Make/makerules index 8c2479554..594b58b1e 100644 --- a/Make/makerules +++ b/Make/makerules @@ -1,48 +1,48 @@ -default : opt +default: opt -opt : $(EXEC:=.opt)\ +opt: $(EXEC:=.opt)\ $(LIB:=.opt)\ $(PLUGIN:=.opt)\ -debug : $(EXEC:=.dbg)\ +debug: $(EXEC:=.dbg)\ $(LIB:=.dbg)\ $(PLUGIN:=.dbg)\ -cleandepend : cleandependopt cleandependdbg +cleandepend: cleandependopt cleandependdbg -cleandependopt : - [ -d $(OPTDIR) ] && cd $(OPTDIR); rm -f Makedepend; rm -rf .depend +cleandependopt: + @[ -d $(OPTDIR) ] && cd $(OPTDIR); rm -f Makedepend; rm -rf .depend -cleandependdbg : - [ -d $(DEBUGDIR) ] && cd $(DEBUGDIR); rm -f Makedepend; rm -rf .depend +cleandependdbg: + @[ -d $(DEBUGDIR) ] && cd $(DEBUGDIR); rm -f Makedepend; rm -rf .depend -cleantarget : cleantargetopt cleantargetdbg +cleantarget: cleantargetopt cleantargetdbg -cleantargetopt : +cleantargetopt: @[ -d $(OPTDIR) ] && cd $(OPTDIR); rm -f $(EXEC) $(LIB) $(PLUGIN) -cleantargetdbg : +cleantargetdbg: @[ -d $(DEBUGDIR) ] && cd $(DEBUGDIR); rm -f $(EXEC) $(LIB) $(PLUGIN) -clean : cleanopt cleandbg +clean: cleanopt cleandbg -cleanopt : - [ -d $(OPTDIR) ] && cd $(OPTDIR); rm -f $(OBJS) Makedepend; rm -rf .depend +cleanopt: + @[ -d $(OPTDIR) ] && cd $(OPTDIR); rm -f $(OBJS) Makedepend; rm -rf .depend -cleandbg : - [ -d $(DEBUGDIR) ] && cd $(DEBUGDIR); rm -f $(OBJS) Makedepend; rm -rf .depend +cleandbg: + @[ -d $(DEBUGDIR) ] && cd $(DEBUGDIR); rm -f $(OBJS) Makedepend; rm -rf .depend -clobber : clobberdbg clobberopt +clobber: clobberdbg clobberopt -clobberopt : +clobberopt: rm -rf $(OPTDIR) -clobberdbg : +clobberdbg: rm -rf $(DEBUGDIR) -beautify : +beautify: for f in *.cpp ; do mv $$f $$f.bak; bcpp $$f.bak $$f; rm $$f.bak; done for f in *.h ; do mv $$f $$f.bak; bcpp $$f.bak $$f; rm $$f.bak; done @@ -55,7 +55,7 @@ docs: "$(TOPDIR)/doc/doc++/$(TARGET_BASENAME)" -$(EXEC) : $(OBJS) +$(EXEC): $(OBJS) $(C++) $(LDFLAGS) $(OBJS) $(LIBS) -o $@ @@ -65,10 +65,10 @@ $(EXEC) : $(OBJS) ifeq ($(OS),Darwin) -$(LIB) : $(OBJS) +$(LIB): $(OBJS) $(C++) $(LDFLAGS) -dynamiclib $(OBJS) $(LIBS) -o $@ -$(PLUGIN) : $(OBJS) +$(PLUGIN): $(OBJS) $(C++) $(LDFLAGS) -bundle $(OBJS) $(LIBS) -o $@ else ifeq ($(OS),HP-UX) @@ -89,7 +89,7 @@ $(EXEC:=.dbg) : $(MAKE) -f ../GNUmakefile "DOF=$(DBGF)" TOPDIR=../${TOPDIR} \ THISDIR=../$(THISDIR)\ MAKEDEPEND=Makedepend $(EXEC) - @$(MAKE) LNSRC=$(DEBUGDIR)/$(EXEC) LNDEST=$(BININST)/$(EXEC) __link + @$(MAKE) LNSRC=$(DEBUGDIR)/$(EXEC) LNDEST=$(BININST)/$(OS)$(ARCH)/$(EXEC) __link $(LIB:=.dbg) : $(PLUGIN:=.dbg) @[ -d $(DEBUGDIR) ] || mkdir $(DEBUGDIR) @@ -97,7 +97,7 @@ $(LIB:=.dbg) : $(PLUGIN:=.dbg) $(MAKE) -f ../GNUmakefile "DOF=$(DBGF)" TOPDIR=../${TOPDIR} \ THISDIR=../$(THISDIR)\ MAKEDEPEND=Makedepend $(LIB) - @$(MAKE) LNSRC=$(DEBUGDIR)/$(LIB) LNDEST=$(LIBINST)/$(LIB) __link + @$(MAKE) LNSRC=$(DEBUGDIR)/$(LIB) LNDEST=$(LIBINST)/$(OS)$(ARCH)/$(LIB) __link $(PLUGIN:=.dbg) : @[ -d $(DEBUGDIR) ] || mkdir $(DEBUGDIR) @@ -113,7 +113,7 @@ $(EXEC:=.opt) : $(MAKE) -f ../GNUmakefile DOF=$(OPTF) TOPDIR=../${TOPDIR} \ THISDIR=../$(THISDIR)\ MAKEDEPEND=Makedepend $(EXEC) - @$(MAKE) LNSRC=$(OPTDIR)/$(EXEC) LNDEST=$(BININST)/$(EXEC) __link + @$(MAKE) LNSRC=$(OPTDIR)/$(EXEC) LNDEST=$(BININST)/$(OS)$(ARCH)/$(EXEC) __link $(LIB:=.opt) : @@ -122,7 +122,7 @@ $(LIB:=.opt) : $(MAKE) -f ../GNUmakefile DOF=$(OPTF) TOPDIR=../${TOPDIR} \ THISDIR=../$(THISDIR)\ MAKEDEPEND=Makedepend $(LIB) - @$(MAKE) LNSRC=$(OPTDIR)/$(LIB) LNDEST=$(LIBINST)/$(LIB) __link + @$(MAKE) LNSRC=$(OPTDIR)/$(LIB) LNDEST=$(LIBINST)/$(OS)$(ARCH)/$(LIB) __link $(PLUGIN:=.opt) : @[ -d $(OPTDIR) ] || mkdir -p $(OPTDIR) @@ -165,19 +165,9 @@ ifeq (0,1) ##### OLD WAY : Keep until we've proven that this doesn't trip up 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 @@ -188,69 +178,8 @@ endif depend : $(MAKEDEPEND) - -############################################################################### -# -# Ok.. If you are looking hard at the following lines of gnarled code, you -# deserve an explanation. This target makes a link from the installed -# directories (Assumed to be rooted at $(TOPDIR), usually $(TOPDIR)/bin or -# $(TOPDIR)/lib) to a just-built target. Both LNSRC (Link source) and LNDEST -# (Link destination) must be defined before calling 'make __link'. -# -# The first four lines check to see that both LNSRC and LNDEST have been -# defined. -# -# The (very long) following 'if' statement reads in pseudo-code like this: -# -# if the current link is not pointing to the intended destination -# then -# announce (echo) intentions to reset link -# compute the link path by the following steps -# a) define SRCDIR as the current absolute directory -# appended by the directory of the intended source of the link -# b) define DESTDIR as the absolute path of $(TOPDIR) appended by -# the directory of the intended destination of the link -# c) define a temproary variable T to be the absolute path of -# the destination directory less the prefix of the absolute -# path of $(TOPDIR) -# e.g. /root/work/thisdir/bin/ - /root/work/thisdir/ = bin/ -# d) Run a loop, truncating the path represented by T until -# 'dirname' returns '.'. On each iteration increment PFX -# (Prefix) by '../' This will define the prefix for the path -# of the link. -# e.g. If DESTDIR is lib/osgPlugins, PFX is ../../ -# e) Define the link as a concatenation of PFX and the absolute -# path of the source directory less the absolute path of -# $(TOPDIR) -# -# Change directories in to the link destination directory -# run the link command -# -############################################################################### - __link : - @[ -n "$(LNSRC)" ] || echo "Internal error (LNSRC definition)" - @[ -n "$(LNSRC)" ] && echo > /dev/null - @[ -n "$(LNDEST)" ] || echo "Internal error (LNDEST definition)" - @[ -n "$(LNDEST)" ] && echo > /dev/null - @if diff -s $(TOPDIR)/$(LNDEST) $(LNSRC) >/dev/null 2>&1;\ - then\ - echo " =====> $(LNSRC) and $(TOPDIR)/$(LNDEST) are in sync";\ - else\ - echo " =====> resetting $(TOPDIR)/$(LNDEST) to point to $(LNSRC)";\ - SRCDIR=`pwd`/`dirname $(LNSRC)`;\ - cd $(TOPDIR);\ - ROOTDIR=`pwd`;\ - DESTDIR=`dirname $$ROOTDIR/$(LNDEST)`;\ - T=`echo $$DESTDIR $$ROOTDIR | \ - awk '{print substr($$1,length($$2)+2,512)}'`;\ - while [ "$$T" != "." ]; do T=`dirname $$T`;PFX=../"$$PFX";done;\ - LINK="$$PFX"`echo $$SRCDIR $$ROOTDIR | awk \ - '{ print substr($$1,length($$2)+2,512) }'`/`basename $(LNDEST)`;\ - cd `dirname $(LNDEST)`;\ - rm -f `basename $(LNDEST)`;\ - $(LINK) $$LINK `basename $(LNDEST)`;\ - fi + sh $(TOPDIR)/Make/dolink.sh $(TOPDIR) $(LNSRC) $(LNDEST) "$(LINK)" __instfiles : @echo $(INSTFILES) diff --git a/examples/osgcameragroup/GNUmakefile b/examples/osgcameragroup/GNUmakefile index 54dba7d2d..77e8a5a21 100644 --- a/examples/osgcameragroup/GNUmakefile +++ b/examples/osgcameragroup/GNUmakefile @@ -8,7 +8,7 @@ LIBS += -losgProducer -lProducer $(OSG_LIBS) $(GL_LIBS) $(X_LIBS) $(OTHER_LI INSTFILES = \ $(CXXFILES)\ - Makefile.inst=Makefile + GNUmakefile.inst=GNUmakefile EXEC = osgcameragroup diff --git a/examples/osghud/GNUmakefile b/examples/osghud/GNUmakefile index 8cc911063..fc4eccd47 100644 --- a/examples/osghud/GNUmakefile +++ b/examples/osghud/GNUmakefile @@ -8,7 +8,7 @@ LIBS += -losgProducer -lProducer -losgText $(OSG_LIBS) $(GL_LIBS) $(X_LIBS) INSTFILES = \ $(CXXFILES)\ - Makefile.inst=Makefile + GNUmakefile.inst=GNUmakefile EXEC = osghud diff --git a/examples/osgreflect/GNUmakefile b/examples/osgreflect/GNUmakefile index 8a96d05a4..3c3c72176 100644 --- a/examples/osgreflect/GNUmakefile +++ b/examples/osgreflect/GNUmakefile @@ -8,7 +8,7 @@ LIBS += -losgProducer -lProducer $(OSG_LIBS) $(GL_LIBS) $(X_LIBS) $(OTHER_LI INSTFILES = \ $(CXXFILES)\ - Makefile.inst=Makefile + GNUmakefile.inst=GNUmakefile EXEC = osgreflect diff --git a/examples/osgstereoimage/GNUmakefile b/examples/osgstereoimage/GNUmakefile index 6b7094209..1fb151515 100644 --- a/examples/osgstereoimage/GNUmakefile +++ b/examples/osgstereoimage/GNUmakefile @@ -8,7 +8,7 @@ LIBS += -losgProducer -lProducer $(OSG_LIBS) $(GL_LIBS) $(X_LIBS) $(OTHER_LI INSTFILES = \ $(CXXFILES)\ - Makefile.inst=Makefile + GNUmakefile.inst=GNUmakefile EXEC = osgstereoimage diff --git a/examples/osgtext/GNUmakefile b/examples/osgtext/GNUmakefile index d4e74a6e6..b43ff33f3 100644 --- a/examples/osgtext/GNUmakefile +++ b/examples/osgtext/GNUmakefile @@ -8,7 +8,7 @@ LIBS += -losgProducer -lProducer -losgText $(OSG_LIBS) $(GL_LIBS) $(X_LIBS) INSTFILES = \ $(CXXFILES)\ - Makefile.inst=Makefile + GNUmakefile.inst=GNUmakefile EXEC = osgtext diff --git a/examples/osgviewer/GNUmakefile b/examples/osgviewer/GNUmakefile index 6073b2cdd..25dfd1cef 100644 --- a/examples/osgviewer/GNUmakefile +++ b/examples/osgviewer/GNUmakefile @@ -8,7 +8,7 @@ LIBS += -losgProducer -lProducer $(OSG_LIBS) $(GL_LIBS) $(X_LIBS) $(OTHER_LI INSTFILES = \ $(CXXFILES)\ - Makefile.inst=Makefile + GNUmakefile.inst=GNUmakefile EXEC = osgviewer diff --git a/src/Demos/osganimate/GNUmakefile b/src/Demos/osganimate/GNUmakefile index 2bd5a9f69..0d4ca6dc0 100644 --- a/src/Demos/osganimate/GNUmakefile +++ b/src/Demos/osganimate/GNUmakefile @@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ - Makefile.inst=Makefile + GNUmakefile.inst=GNUmakefile EXEC = osganimate diff --git a/src/Demos/osgbillboard/GNUmakefile b/src/Demos/osgbillboard/GNUmakefile index f3effb8a0..826239767 100644 --- a/src/Demos/osgbillboard/GNUmakefile +++ b/src/Demos/osgbillboard/GNUmakefile @@ -9,7 +9,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ - Makefile.inst=Makefile + GNUmakefile.inst=GNUmakefile EXEC = osgbillboard diff --git a/src/Demos/osgcallback/GNUmakefile b/src/Demos/osgcallback/GNUmakefile index 011b48ff5..74e389947 100644 --- a/src/Demos/osgcallback/GNUmakefile +++ b/src/Demos/osgcallback/GNUmakefile @@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ - Makefile.inst=Makefile + GNUmakefile.inst=GNUmakefile EXEC = osgcallback diff --git a/src/Demos/osgclip/GNUmakefile b/src/Demos/osgclip/GNUmakefile index feb0cb24e..be355d2d4 100644 --- a/src/Demos/osgclip/GNUmakefile +++ b/src/Demos/osgclip/GNUmakefile @@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ - Makefile.inst=Makefile + GNUmakefile.inst=GNUmakefile EXEC = osgclip diff --git a/src/Demos/osgcluster/GNUmakefile b/src/Demos/osgcluster/GNUmakefile index 8ef7c05d1..89e4a5832 100644 --- a/src/Demos/osgcluster/GNUmakefile +++ b/src/Demos/osgcluster/GNUmakefile @@ -16,7 +16,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(SOCKET_LIBS) $(OTHER_ INSTFILES = \ $(CXXFILES)\ $(HEADERFILES)\ - Makefile.inst=Makefile + GNUmakefile.inst=GNUmakefile EXEC = osgcluster diff --git a/src/Demos/osgconv/GNUmakefile b/src/Demos/osgconv/GNUmakefile index 887c7f236..e862c7c6c 100644 --- a/src/Demos/osgconv/GNUmakefile +++ b/src/Demos/osgconv/GNUmakefile @@ -13,7 +13,7 @@ LIBS += -losg -losgUtil -losgDB $(GL_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ $(HEADERFILES)\ - Makefile.inst=Makefile + GNUmakefile.inst=GNUmakefile EXEC = osgconv diff --git a/src/Demos/osgcopy/GNUmakefile b/src/Demos/osgcopy/GNUmakefile index 4ed5196b6..a98db15f9 100644 --- a/src/Demos/osgcopy/GNUmakefile +++ b/src/Demos/osgcopy/GNUmakefile @@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ - Makefile.inst=Makefile + GNUmakefile.inst=GNUmakefile EXEC = osgcopy diff --git a/src/Demos/osgcube/GNUmakefile b/src/Demos/osgcube/GNUmakefile index be3416fc9..9ae0258a4 100644 --- a/src/Demos/osgcube/GNUmakefile +++ b/src/Demos/osgcube/GNUmakefile @@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ - Makefile.inst=Makefile + GNUmakefile.inst=GNUmakefile EXEC = osgcube diff --git a/src/Demos/osgcubemap/GNUmakefile b/src/Demos/osgcubemap/GNUmakefile index 3c745cb9d..922f276aa 100644 --- a/src/Demos/osgcubemap/GNUmakefile +++ b/src/Demos/osgcubemap/GNUmakefile @@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ - Makefile.inst=Makefile + GNUmakefile.inst=GNUmakefile EXEC = osgcubemap diff --git a/src/Demos/osggeodemo/GNUmakefile b/src/Demos/osggeodemo/GNUmakefile index 914ea8da2..ad7507663 100644 --- a/src/Demos/osggeodemo/GNUmakefile +++ b/src/Demos/osggeodemo/GNUmakefile @@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ - Makefile.inst=Makefile + GNUmakefile.inst=GNUmakefile EXEC = osggeodemo diff --git a/src/Demos/osggeometry/GNUmakefile b/src/Demos/osggeometry/GNUmakefile index 267b697ae..e42580925 100644 --- a/src/Demos/osggeometry/GNUmakefile +++ b/src/Demos/osggeometry/GNUmakefile @@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ - Makefile.inst=Makefile + GNUmakefile.inst=GNUmakefile EXEC = osggeometry diff --git a/src/Demos/osghangglide/GNUmakefile b/src/Demos/osghangglide/GNUmakefile index 62930ea68..6bd15e06c 100644 --- a/src/Demos/osghangglide/GNUmakefile +++ b/src/Demos/osghangglide/GNUmakefile @@ -23,7 +23,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ $(HEADERFILES)\ - Makefile.inst=Makefile + GNUmakefile.inst=GNUmakefile EXEC = osghangglide diff --git a/src/Demos/osghud/GNUmakefile b/src/Demos/osghud/GNUmakefile index a2746fe9d..98ca96ac7 100644 --- a/src/Demos/osghud/GNUmakefile +++ b/src/Demos/osghud/GNUmakefile @@ -9,7 +9,7 @@ LIBS += -losgText $(OSG_LIBS) -L/usr/local/lib $(FREETYPE_LIB) $(GLUT_LIB) $ INSTFILES = \ $(CXXFILES)\ - Makefile.inst=Makefile + GNUmakefile.inst=GNUmakefile EXEC = osghud diff --git a/src/Demos/osgimpostor/GNUmakefile b/src/Demos/osgimpostor/GNUmakefile index 587288c7c..46b5a8c7a 100644 --- a/src/Demos/osgimpostor/GNUmakefile +++ b/src/Demos/osgimpostor/GNUmakefile @@ -9,7 +9,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ - Makefile.inst=Makefile + GNUmakefile.inst=GNUmakefile EXEC = osgimpostor diff --git a/src/Demos/osglight/GNUmakefile b/src/Demos/osglight/GNUmakefile index 0229e07e3..5ddf48b52 100644 --- a/src/Demos/osglight/GNUmakefile +++ b/src/Demos/osglight/GNUmakefile @@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ - Makefile.inst=Makefile + GNUmakefile.inst=GNUmakefile EXEC = osglight diff --git a/src/Demos/osglightpoint/GNUmakefile b/src/Demos/osglightpoint/GNUmakefile index 898872371..dc7147d78 100644 --- a/src/Demos/osglightpoint/GNUmakefile +++ b/src/Demos/osglightpoint/GNUmakefile @@ -8,7 +8,7 @@ LIBS += -losgSim $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ - Makefile.inst=Makefile + GNUmakefile.inst=GNUmakefile EXEC = osglightpoint diff --git a/src/Demos/osglogo/GNUmakefile b/src/Demos/osglogo/GNUmakefile index e19dba034..82008690d 100644 --- a/src/Demos/osglogo/GNUmakefile +++ b/src/Demos/osglogo/GNUmakefile @@ -8,7 +8,7 @@ LIBS += -losgText $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ - Makefile.inst=Makefile + GNUmakefile.inst=GNUmakefile EXEC = osglogo diff --git a/src/Demos/osgmultitexture/GNUmakefile b/src/Demos/osgmultitexture/GNUmakefile index c9aad86aa..b1a336030 100644 --- a/src/Demos/osgmultitexture/GNUmakefile +++ b/src/Demos/osgmultitexture/GNUmakefile @@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ - Makefile.inst=Makefile + GNUmakefile.inst=GNUmakefile EXEC = osgmultitexture diff --git a/src/Demos/osgoccluder/GNUmakefile b/src/Demos/osgoccluder/GNUmakefile index 0d05c021d..a85393a06 100644 --- a/src/Demos/osgoccluder/GNUmakefile +++ b/src/Demos/osgoccluder/GNUmakefile @@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ - Makefile.inst=Makefile + GNUmakefile.inst=GNUmakefile EXEC = osgoccluder diff --git a/src/Demos/osgparticle/GNUmakefile b/src/Demos/osgparticle/GNUmakefile index 648e825cd..e3b4edb60 100644 --- a/src/Demos/osgparticle/GNUmakefile +++ b/src/Demos/osgparticle/GNUmakefile @@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) -losgPart INSTFILES = \ $(CXXFILES)\ - Makefile.inst=Makefile + GNUmakefile.inst=GNUmakefile EXEC = osgparticle diff --git a/src/Demos/osgprerender/GNUmakefile b/src/Demos/osgprerender/GNUmakefile index e2efc2caa..718c4e07a 100644 --- a/src/Demos/osgprerender/GNUmakefile +++ b/src/Demos/osgprerender/GNUmakefile @@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ - Makefile.inst=Makefile + GNUmakefile.inst=GNUmakefile EXEC = osgprerender diff --git a/src/Demos/osgreflect/GNUmakefile b/src/Demos/osgreflect/GNUmakefile index 6a87cd16e..d09d096ad 100644 --- a/src/Demos/osgreflect/GNUmakefile +++ b/src/Demos/osgreflect/GNUmakefile @@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ - Makefile.inst=Makefile + GNUmakefile.inst=GNUmakefile EXEC = osgreflect diff --git a/src/Demos/osgscribe/GNUmakefile b/src/Demos/osgscribe/GNUmakefile index 891803648..cd2da7043 100644 --- a/src/Demos/osgscribe/GNUmakefile +++ b/src/Demos/osgscribe/GNUmakefile @@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ - Makefile.inst=Makefile + GNUmakefile.inst=GNUmakefile EXEC = osgscribe diff --git a/src/Demos/osgsequence/GNUmakefile b/src/Demos/osgsequence/GNUmakefile index 134e095d9..3f5016d6a 100644 --- a/src/Demos/osgsequence/GNUmakefile +++ b/src/Demos/osgsequence/GNUmakefile @@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ - Makefile.inst=Makefile + GNUmakefile.inst=GNUmakefile EXEC = osgsequence diff --git a/src/Demos/osgshadowtexture/GNUmakefile b/src/Demos/osgshadowtexture/GNUmakefile index a064dde96..596e06597 100644 --- a/src/Demos/osgshadowtexture/GNUmakefile +++ b/src/Demos/osgshadowtexture/GNUmakefile @@ -9,7 +9,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ - Makefile.inst=Makefile + GNUmakefile.inst=GNUmakefile EXEC = osgshadowtexture diff --git a/src/Demos/osgshape/GNUmakefile b/src/Demos/osgshape/GNUmakefile index c9fe8c5d4..9b8fc7abb 100644 --- a/src/Demos/osgshape/GNUmakefile +++ b/src/Demos/osgshape/GNUmakefile @@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ - Makefile.inst=Makefile + GNUmakefile.inst=GNUmakefile EXEC = osgshape diff --git a/src/Demos/osgstereoimage/GNUmakefile b/src/Demos/osgstereoimage/GNUmakefile index e13c66981..0815e327e 100644 --- a/src/Demos/osgstereoimage/GNUmakefile +++ b/src/Demos/osgstereoimage/GNUmakefile @@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ - Makefile.inst=Makefile + GNUmakefile.inst=GNUmakefile EXEC = osgstereoimage diff --git a/src/Demos/osgteapot/GNUmakefile b/src/Demos/osgteapot/GNUmakefile index 4c9415a94..5a9ba9010 100644 --- a/src/Demos/osgteapot/GNUmakefile +++ b/src/Demos/osgteapot/GNUmakefile @@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ - Makefile.inst=Makefile + GNUmakefile.inst=GNUmakefile EXEC = osgteapot diff --git a/src/Demos/osgtext/GNUmakefile b/src/Demos/osgtext/GNUmakefile index 2a942b852..06de54337 100644 --- a/src/Demos/osgtext/GNUmakefile +++ b/src/Demos/osgtext/GNUmakefile @@ -9,7 +9,7 @@ LIBS += -losgText $(OSG_LIBS) -L/usr/local/lib $(FREETYPE_LIB) $(GLUT_LIB) $ INSTFILES = \ $(CXXFILES)\ - Makefile.inst=Makefile + GNUmakefile.inst=GNUmakefile EXEC = osgtext diff --git a/src/Demos/osgtexture1D/GNUmakefile b/src/Demos/osgtexture1D/GNUmakefile index 6619b5a60..e12740d46 100644 --- a/src/Demos/osgtexture1D/GNUmakefile +++ b/src/Demos/osgtexture1D/GNUmakefile @@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ - Makefile.inst=Makefile + GNUmakefile.inst=GNUmakefile EXEC = osgtexture1D diff --git a/src/Demos/osgtexture2D/GNUmakefile b/src/Demos/osgtexture2D/GNUmakefile index 151f145da..075d294eb 100644 --- a/src/Demos/osgtexture2D/GNUmakefile +++ b/src/Demos/osgtexture2D/GNUmakefile @@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ - Makefile.inst=Makefile + GNUmakefile.inst=GNUmakefile EXEC = osgtexture2D diff --git a/src/Demos/osgtexture3D/GNUmakefile b/src/Demos/osgtexture3D/GNUmakefile index e4e660417..e5afc408a 100644 --- a/src/Demos/osgtexture3D/GNUmakefile +++ b/src/Demos/osgtexture3D/GNUmakefile @@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ - Makefile.inst=Makefile + GNUmakefile.inst=GNUmakefile EXEC = osgtexture3D diff --git a/src/Demos/osgunittests/GNUmakefile b/src/Demos/osgunittests/GNUmakefile index b1e41fcd9..cfda9c813 100644 --- a/src/Demos/osgunittests/GNUmakefile +++ b/src/Demos/osgunittests/GNUmakefile @@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ - Makefile.inst=Makefile + GNUmakefile.inst=GNUmakefile EXEC = osgunittests diff --git a/src/Demos/osgversion/GNUmakefile b/src/Demos/osgversion/GNUmakefile index f21159c43..39d82d161 100755 --- a/src/Demos/osgversion/GNUmakefile +++ b/src/Demos/osgversion/GNUmakefile @@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ - Makefile.inst=Makefile + GNUmakefile.inst=GNUmakefile EXEC = osgversion diff --git a/src/Demos/osgvertexprogram/GNUmakefile b/src/Demos/osgvertexprogram/GNUmakefile index 039e776d0..0f2a5d2b6 100644 --- a/src/Demos/osgvertexprogram/GNUmakefile +++ b/src/Demos/osgvertexprogram/GNUmakefile @@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ - Makefile.inst=Makefile + GNUmakefile.inst=GNUmakefile EXEC = osgvertexprogram diff --git a/src/Demos/osgviews/GNUmakefile b/src/Demos/osgviews/GNUmakefile index 78bc7c8e4..8958110cb 100644 --- a/src/Demos/osgviews/GNUmakefile +++ b/src/Demos/osgviews/GNUmakefile @@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ - Makefile.inst=Makefile + GNUmakefile.inst=GNUmakefile EXEC = osgviews diff --git a/src/Demos/sgv/GNUmakefile b/src/Demos/sgv/GNUmakefile index 294b7f571..254d2e8c2 100644 --- a/src/Demos/sgv/GNUmakefile +++ b/src/Demos/sgv/GNUmakefile @@ -8,7 +8,7 @@ LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ - Makefile.inst=Makefile + GNUmakefile.inst=GNUmakefile EXEC = sgv