From f69e1276a900e480bce5e45b92913e3fc43bd39e Mon Sep 17 00:00:00 2001 From: Don BURNS Date: Tue, 16 Apr 2002 03:24:41 +0000 Subject: [PATCH] fixed a few problems that didn't work right with installing demo source on platforms other than Solaris. --- Make/instdemosrc | 116 +++++++++++++++------------- Make/instrules | 70 +++++++++++------ Make/makedefs | 1 - src/osgGLUT/Makefile | 2 +- src/osgPlugins/quicktime/Makedepend | 0 5 files changed, 108 insertions(+), 81 deletions(-) delete mode 100644 src/osgPlugins/quicktime/Makedepend diff --git a/Make/instdemosrc b/Make/instdemosrc index 5c99bf9d5..d9c43013b 100755 --- a/Make/instdemosrc +++ b/Make/instdemosrc @@ -1,94 +1,102 @@ #!/bin/sh -OS=$1 -TOPDIR=$2 -INST_LIBS=$3 -INST_PLUGINS=$4 -INST_INCLUDE=$5 -INST_DEMOS=$6 -INST_SRC=$7 -INST_DEMO_SRC=$8 +TOPDIR=$1 +INST_LIBS=$2 +INST_INCLUDE=$3 +INST_SRC=$4 +INST_DEMO_SRC=$5 +INSTALLCMD=$6 +COMPILER=$7 +OPTF=$8 shift; shift; shift; shift; shift; shift; shift; shift; -INST_DOC=$1 -INST_DATA=$2 -OPTF=$3 -DEPARG=$4 +DEPARG=$1 +LINKARGS=$2 +OSG_LIBS=$3 +FREETYPE_LIB=$4 +GLUT_LIB=$5 +GL_LIBS=$6 +X_LIBS=$7 +SOCKET_LIBS=$8 +shift; shift; shift; shift; shift; shift; shift; shift; +OTHER_LIBS=$1 +TIFF_LIB=$2 copy_demo_source() { -for d in `ls $TOPDIR/src/Demos/ | grep -v CVS` -do - if [ -d $TOPDIR/src/Demos/$d ] - then - 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 - src=`echo $f | cut -f1 -d"="` - dst=`echo $f | cut -f2 -d"="` - if [ -z "$dst" ] ; then dst=$src; fi - echo cp $src $INST_DEMO_SRC/$d/$dst - cp $src $INST_DEMO_SRC/$d/$dst - chmod 0444 $INST_DEMO_SRC/$d/$dst + for d in `ls $TOPDIR/src/Demos/ | grep -v CVS` + do + if [ -d $TOPDIR/src/Demos/$d ] + then + 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 + 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 + $INSTALLCMD `pwd`/$src $INST_DEMO_SRC/$d/$dst + done + cd $THISDIR + fi done - cd $THISDIR - fi -done } generate_makedefs() { cat <<-EOF + TOPDIR ?= ../ THISDIR = . INC = -I$INST_INCLUDE -I./ DEF = $DEF -CXXFLAGS = $(ARCHARGS) $OPTF $(DEF) $(INC) -LDFLAGS = $(ARCHARGS) $OPTF -L$INST_LIBS -OBJS = $(C++FILES:.cpp=.o) $(CXXFILES:.cpp=.o) $(CFILES:.c=.o) -C++ = CC -DYNAMICLIBRARYLIB = -ldl -OSG_LIBS = -losgGLUT -losgDB -losgUtil -losg -FREETYPE_LIB = -lfreetype -GLUT_LIB = -lglut -GL_LIBS = -lGLU -lGL -X_LIBS = -lXext -lXmu -lXi -lX11 -SOCKET_LIBS = -lsocket -lnsl -OTHER_LIBS = -lCstd -TIFF_LIB = -ltiff +CXXFLAGS = \$(ARCHARGS) $OPTF \$(DEF) \$(INC) +LDFLAGS = \$(ARCHARGS) $OPTF -L$INST_LIBS $LINKARGS +OBJS = \$(C++FILES:.cpp=.o) \$(CXXFILES:.cpp=.o) \$(CFILES:.c=.o) +C++ = $COMPILER +OSG_LIBS = $OSG_LIBS +FREETYPE_LIB = $FREETYPE_LIB +GLUT_LIB = $GLUT_LIB +GL_LIBS = $GL_LIBS +X_LIBS = $X_LIBS +SOCKET_LIBS = $SOCKET_LIBS +OTHER_LIBS = $OTHER_LIBS +TIFF_LIB = $TIFF_LIB VPATH = .. + EOF } + generate_makerules() { cat <<-EOF1 | sed 's/TAB/ /' -all : $(EXEC) $(LIB) $(PLUGIN) +all : \$(EXEC) \$(LIB) \$(PLUGIN) -$(EXEC) : Makedepend $(OBJS) -TAB$(C++) $(LDFLAGS) $(OBJS) $(LIBS) -o \$@ +\$(EXEC) : Makedepend \$(OBJS) +TAB\$(C++) \$(LDFLAGS) \$(OBJS) \$(LIBS) -o \$@ -$(LIB) $(PLUGIN) : $(OBJS) -TAB$(C++) $(LDFLAGS) $(SHARED) $(OBJS) $(LIBS) -o \$@ +\$(LIB) \$(PLUGIN) : \$(OBJS) +TAB\$(C++) \$(LDFLAGS) \$(SHARED) \$(OBJS) \$(LIBS) -o \$@ clean : -TABrm -f $(OBJS) $(MAKEDEPEND) +TABrm -f \$(OBJS) \$(MAKEDEPEND) clobber : clean -TABrm -f $(EXEC) $(LIB) $(PLUGIN) +TABrm -f \$(EXEC) \$(LIB) \$(PLUGIN) -Makedepend : $(CXXFILES) $(CFILES) -TAB$(C++) $(INC) $DEPARG \$? > \$@ +Makedepend : \$(CXXFILES) \$(CFILES) +TAB\$(C++) \$(INC) $DEPARG \$? > \$@ .SUFFIXES: .cpp .o .cpp.o: -TAB$(C++) $(CXXFLAGS) -c $< +TAB\$(C++) \$(CXXFLAGS) -c $< sinclude Makedepend @@ -100,7 +108,7 @@ EOF1 echo =========== Installing Demo Source Code ================= -echo " generaing make files ..." +echo " generating make files ..." generate_makedefs > $INST_SRC/Make/makedefs generate_makerules > $INST_SRC/Make/makerules diff --git a/Make/instrules b/Make/instrules index 8d04d3687..78385a7bd 100644 --- a/Make/instrules +++ b/Make/instrules @@ -13,17 +13,22 @@ __instbin: INSTALL?="$(INSTBINCMD)" __install @$(MAKE) INSTSRC=$(TOPDIR)/lib/osgPlugins INSTDEST=$(INST_PLUGINS)\ INSTALL?="$(INSTBINCMD)" __install - @echo \ - "\n"\ - " Run-time environment installation successful. Add \n"\ - " $(INST_DEMOS)\n"\ - " to your PATH environmental variable, and \n"\ - " $(INST_LIBS) and $(INST_PLUGINS) \n"\ - " to your LD_LIBRARY_PATH if not already present.\n"\ - "\n" >> $(INSTLOGFILE) + @echo >> $(INSTLOGFILE) + @echo " Run-time environment installation successful. Add "\ + >> $(INSTLOGFILE) + @echo " $(INST_DEMOS)"\ + >> $(INSTLOGFILE) + @echo " to your PATH environmental variable, and"\ + >> $(INSTLOGFILE) + @echo " $(INST_LIBS) and $(INST_PLUGINS)"\ + >> $(INSTLOGFILE) + @echo " to your LD_LIBRARY_PATH if not already present."\ + >> $(INSTLOGFILE) + @echo >> $(INSTLOGFILE) __instdev: +ifeq (0,1) @for d in `ls -1 $(TOPDIR)/include/ | grep -v CVS`; \ do\ if [ -d $(TOPDIR)/include/$$d ]; \ @@ -32,42 +37,57 @@ __instdev: INSTALL?="$(INSTDEVCMD)" __install;\ fi\ done +endif @$(TOPDIR)/Make/instdemosrc \ - $(OS)\ $(TOPDIR)\ $(INST_LIBS)\ - $(INST_PLUGINS)\ $(INST_INCLUDE)\ - $(INST_DEMOS)\ $(INST_SRC)\ $(INST_DEMO_SRC)\ - $(INST_DOC)\ - $(INST_DATA)\ + "$(INSTDEVCMD)"\ + "$(C++)"\ "$(OPTF)"\ - "$(DEPARG)" - @echo \ - "\n"\ - " Development environment installation successful. Add\n"\ - " -I$(INST_INCLUDE)\n"\ - " compile flag when compiling with OSG header files.\n"\ - " Example programs can be found at $(INST_DEMO_SRC).\n"\ - "\n" >> $(INSTLOGFILE) + "$(DEPARG)"\ + "$(LINKARGS)"\ + "$(OSG_LIBS)"\ + "$(FREETYPE_LIB)"\ + "$(GLUT_LIB)"\ + "$(GL_LIBS)"\ + "$(X_LIBS)"\ + "$(SOCKET_LIBS)"\ + "$(OTHER_LIBS)"\ + "$(TIFF_LIB)"\ + + + @echo\ + >> $(INSTLOGFILE) + @echo " Development environment installation successful. Add"\ + >> $(INSTLOGFILE) + @echo " -I$(INST_INCLUDE)"\ + >> $(INSTLOGFILE) + @echo " compile flag when compiling with OSG header files."\ + >> $(INSTLOGFILE) + @echo " Example programs can be found at $(INST_DEMO_SRC)."\ + >> $(INSTLOGFILE) + @echo >> $(INSTLOGFILE) + + instlinks : @rm -f $(INSTLOGFILE) - $(MAKE) INSTALL="$(INSTLINKBINCMD)" __instbin - $(MAKE) INSTALL="$(INSTLINKDEVCMD)" __instdev + $(MAKE) INSTBINCMD="$(INSTLINKBINCMD)" __instbin + $(MAKE) INSTDEVCMD="$(INSTLINKDEVCMD)" __instdev @more $(INSTLOGFILE) instlinksbin : @rm -f $(INSTLOGFILE) - $(MAKE) INSTALL="$(INSTLINKBINCMD)" __instbin + $(MAKE) INSTBINCMD="$(INSTLINKBINCMD)" __instbin @more $(INSTLOGFILE) instlinksdev : @rm -f $(INSTLOGFILE) - $(MAKE) INSTALL="$(INSTLINKDEVCMD)" __instdev + @$(MAKE) INSTDEVCMD="$(INSTLINKDEVCMD)" __instdev @more $(INSTLOGFILE) diff --git a/Make/makedefs b/Make/makedefs index b6e72f5bf..370ca1206 100644 --- a/Make/makedefs +++ b/Make/makedefs @@ -222,7 +222,6 @@ ifeq ($(OS),Darwin) SOCKET_LIBS = OTHER_LIBS = -lm -ldl -lstdc++ -lobjc LIBEXT = dylib - PLUGINEXT = so QUICKTIME_LIB = -framework QuickTime TIFF_LIB = -ltiff diff --git a/src/osgGLUT/Makefile b/src/osgGLUT/Makefile index b40c9f67f..0cddc37fa 100644 --- a/src/osgGLUT/Makefile +++ b/src/osgGLUT/Makefile @@ -7,7 +7,7 @@ CXXFILES =\ Window.cpp\ Viewer.cpp\ -LIBS += $(GLUT_LIB) -losgUtil -losgDB -losg $(OTHER_LIBS) +LIBS += $(GLUT_LIB) $(GL_LIBS) -losgUtil -losgDB -losg $(OTHER_LIBS) DEF += -DOSGGLUT_LIBRARY TARGET_BASENAME = osgGLUT LIB = $(LIB_PREFIX)$(TARGET_BASENAME).$(LIB_EXT) diff --git a/src/osgPlugins/quicktime/Makedepend b/src/osgPlugins/quicktime/Makedepend deleted file mode 100644 index e69de29bb..000000000