FGFS-4.1/OpenSceneGraph
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reinstated Norman Vine's TARGET_BASENAME variable in the makefiles and

Browse Source 
added prefixes and suffixes to libs and plugins.  ALl this to accomodate
cygwin...

Also added INST_SYS_PREFIX and INST_SHARE_PREFIX for installation, as well
as "standardizing" the install locations for the various platforms.
This commit is contained in:
Don BURNS
2002-04-03 17:42:12 +00:00
parent 12043abd40
commit e0adca775b
37 changed files with 233 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Make/instrules
View File

@@ -2,11 +2,11 @@ install : instbin instdev
instbin :
@$(MAKE) INSTSRC=$(TOPDIR)/bin INSTDEST=$(INST_DEMOS) \
INSTALL?="$(INSTBIN)" __install
INSTALL?="$(INSTBINCMD)" __install
@$(MAKE) INSTSRC=$(TOPDIR)/lib INSTDEST=$(INST_LIBS) \
INSTALL?="$(INSTBIN)" __install
INSTALL?="$(INSTBINCMD)" __install
@$(MAKE) INSTSRC=$(TOPDIR)/lib/osgPlugins INSTDEST=$(INST_PLUGINS)\
INSTALL?="$(INSTBIN)" __install
INSTALL?="$(INSTBINCMD)" __install
instdev :
@@ -15,7 +15,7 @@ instdev :
if [ -d $(TOPDIR)/include/$$d ]; \
then \
$(MAKE) INSTSRC=$(TOPDIR)/include/$$d INSTDEST=$(INST_INCLUDE)/$$d\
INSTALL?="$(INSTDEV)" __install;\
INSTALL?="$(INSTDEVCMD)" __install;\
fi\
done
@for d in `ls -1 $(TOPDIR)/src/Demos | grep -v CVS`; \
@@ -23,7 +23,7 @@ instdev :
if [ -d $(TOPDIR)/src/Demos/$$d ]; \
then \
$(MAKE) INSTSRC=$(TOPDIR)/src/Demos/$$d INSTDEST=$(INST_DEMO_SRC)/$$d\
INSTALL?="$(INSTDEV)" __install;\
INSTALL?="$(INSTDEVCMD)" __install;\
fi\
done
@@ -39,11 +39,11 @@ instclean : instcleanbin instcleandev
instcleanbin :
@$(MAKE) INSTSRC=$(TOPDIR)/bin INSTDEST=$(INST_DEMOS) \
INSTALL?="$(INSTBIN)" __instclean
INSTALL?="$(INSTBINCMD)" __instclean
@$(MAKE) INSTSRC=$(TOPDIR)/lib INSTDEST=$(INST_LIBS) \
INSTALL?="$(INSTBIN)" __instclean
INSTALL?="$(INSTBINCMD)" __instclean
@$(MAKE) INSTSRC=$(TOPDIR)/lib/osgPlugins INSTDEST=$(INST_PLUGINS)\
INSTALL?="$(INSTBIN)" __instclean
INSTALL?="$(INSTBINCMD)" __instclean
instcleandev :
@for d in `ls -1 $(TOPDIR)/include/ | grep -v CVS`; \
@@ -51,7 +51,7 @@ instcleandev :
if [ -d $(TOPDIR)/include/$$d ]; \
then \
$(MAKE) INSTSRC=$(TOPDIR)/include/$$d INSTDEST=$(INST_INCLUDE)/$$d\
INSTALL?="$(INSTDEV)" __instclean;\
INSTALL?="$(INSTDEVCMD)" __instclean;\
fi\
done
@for d in `ls -1 $(TOPDIR)/src/Demos | grep -v CVS`; \
@@ -59,7 +59,7 @@ instcleandev :
if [ -d $(TOPDIR)/src/Demos/$$d ]; \
then \
$(MAKE) INSTSRC=$(TOPDIR)/src/Demos/$$d INSTDEST=$(INST_DEMO_SRC)/$$d\
INSTALL?="$(INSTDEV)" __instclean;\
INSTALL?="$(INSTDEVCMD)" __instclean;\
fi\
done

74
Make/makedefs
View File

@@ -28,19 +28,27 @@ BININST = bin
LIBINST = lib
PLUGININST = lib/osgPlugins
INST_DEMOS = /usr/share/OpenSceneGraph/bin
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
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_DEMO_SRC = $(INST_SHARE_PREFIX)/OpenSceneGraph/src/demos
INST_DOC = $(INST_SHARE_REFIX)/OpenSceneGraph/doc
INST_DATA = $(INST_SHARE_PREFIX)/OpenSceneGraph/data
LINK = ln -sf
INSTBIN = install -m 755
INSTDEV = install -m 644
INSTBINCMD = install -m 755
INSTDEVCMD = install -m 644
INSTLINKBIN = $(LINK)
INSTLINKDEV = $(LINK)
LIB_PREFIX = lib
LIB_EXT = so
PLUGIN_PREFIX = osgdb_
PLUGIN_EXT = so
ALL_TARGETS = \
opt\
@@ -48,6 +56,9 @@ ALL_TARGETS = \
clean\
cleandbg\
cleanopt\
cleanlite\
cleanliteopt\
cleanlitedbg\
clobber\
beautify\
docs\
@@ -60,7 +71,7 @@ ifeq ($(OS),SunOS)
DEPARG = -xM1
INC +=
DEF += -features=extensions
OPTF = -xO2
OPTF = -xO4
DBGF = -g
SHARED = -G
ifeq ($(ARCH),64)
@@ -77,12 +88,17 @@ endif
X_LIBS = -lXext -lXmu -lXi -lX11
SOCKET_LIBS = -lsocket -lnsl
OTHER_LIBS = -lCstd
SO_EXT = so
PLUGIN_EXT = so
TIFF_LIB = -ltiff
INSTBIN = cp
INSTDEV = cp
INSTBINCMD = cp
INSTDEVCMD = cp
INST_DEMOS = /opt/OpenSceneGraph/bin
INST_LIBS = /opt/OpenSceneGrpah/lib$(ARCH) /usr/lib
INST_PLUGINS = /opt/OpenSceneGraph/lib/osgPlugins
INST_INCLUDE = /opt/OpenSceneGraph/include
INST_DEMO_SRC = /opt/OpenSceneGraph/src/demos
INST_DATA = /opt/OpenSceneGraph/data
endif
@@ -113,8 +129,6 @@ endif
X_LIBS = -lXext -lXi -lXmu -lX11
SOCKET_LIBS =
OTHER_LIBS = -lm
SO_EXT = so
PLUGIN_EXT = so
# INSTLINKBIN = install -t -m 755
# INSTLINKDEV = install -t -m 644
@@ -140,8 +154,6 @@ ifeq ($(OS),Linux)
X_LIBS = -lXmu -lX11
SOCKET_LIBS =
OTHER_LIBS =
SO_EXT = so
PLUGIN_EXT = so
endif
#### FreeBSD specific definitions
@@ -163,8 +175,13 @@ ifeq ($(OS),FreeBSD)
X_LIBS = -lXmu -lX11
SOCKET_LIBS =
OTHER_LIBS =
SO_EXT = so
PLUGIN_EXT = so
INST_DEMOS = /usr/X11R6/bin
INST_LIBS = /usr/X11R6/lib
INST_PLUGINS = /usr/X11R6/lib/osgPlugins
INST_INCLUDE = /usr/X11R6/include
INST_DEMO_SRC = /usr/share/OpenSceneGraph/src/demos
INST_DATA = /usr/share/OpenSceneGraph/data
endif
#### Mac OSX specific definitions
@@ -187,8 +204,8 @@ ifeq ($(OS),Darwin)
X_LIBS =
SOCKET_LIBS =
OTHER_LIBS = -lm -ldl -lstdc++ -lobjc
SO_EXT = dylib
PLUGIN_EXT = so
LIBEXT = dylib
PLUGINEXT = so
QUICKTIME_LIB = -framework QuickTime
TIFF_LIB = -ltiff
@@ -204,8 +221,8 @@ ifeq ($(OS),CYGWIN_NT-5.0)
DBGF = -g
SHARED = -shared\
-Wl,--export-all-symbols \
-Wl,--output-def,lib$$TARGET_BASENAME.def \
-Wl,--out-implib,$(TOPDIR)/lib/lib$$TARGET_BASENAME.a \
-Wl,--output-def,$(LIB_PREFIX)$(TARGET_BASENAME).def \
-Wl,--out-implib,$(TOPDIR)/lib/$(LIB_PREFIX)$(TARGET_BASENAME).a \
ARCHARGS =
LINKARGS = -W -Wall
@@ -233,9 +250,14 @@ ifeq ($(OS),CYGWIN_NT-5.0)
-losgdb_zip
SOCKET_LIBS =
OTHER_LIBS = $(GL_LIBS)
SO_EXT = dll
PLUGIN_EXT = dll
LINK = cp -f
LIB_PREFIX = cyg
LIB_EXT = dll
PLUGIN_PREFIX = osgdb_
PLUGIN_EXT = dll
LINK = cp -f
endif

25
Make/makerules
View File

@@ -64,7 +64,6 @@ $(PLUGIN) : $(OBJS)
else
$(LIB) $(PLUGIN) : $(OBJS)
TARGET_BASENAME=`echo $@ | sed 's/.$(PLUGIN_EXT)//' | sed 's/lib//'`;\
$(C++) $(LDFLAGS) $(SHARED) $(OBJS) $(LIBS) -o $@
endif
@@ -73,41 +72,41 @@ $(EXEC:=.dbg) :
@[ -d $(DEBUGDIR) ] || mkdir $(DEBUGDIR)
@cd $(DEBUGDIR); \
$(MAKE) -f ../Makefile DOF=$(DBGF) TOPDIR=../${TOPDIR} \
THISDIR=../$(THISDIR)\
MAKEDEPEND=Makedepend $(EXEC)
THISDIR=../$(THISDIR)\
MAKEDEPEND=Makedepend $(EXEC)
@$(MAKE) LNSRC=$(DEBUGDIR)/$(EXEC) LNDEST=$(BININST)/$(EXEC) __link
$(LIB:=.dbg) :
@[ -d $(DEBUGDIR) ] || mkdir $(DEBUGDIR)
@cd $(DEBUGDIR); \
@cd $(DEBUGDIR);\
$(MAKE) -f ../Makefile DOF=$(DBGF) TOPDIR=../${TOPDIR} \
THISDIR=../$(THISDIR)\
MAKEDEPEND=Makedepend $(LIB)
THISDIR=../$(THISDIR)\
MAKEDEPEND=Makedepend $(LIB)
@$(MAKE) LNSRC=$(DEBUGDIR)/$(LIB) LNDEST=$(LIBINST)/$(LIB) __link
$(PLUGIN:=.dbg) :
@[ -d $(DEBUGDIR) ] || mkdir $(DEBUGDIR)
@cd $(DEBUGDIR); \
$(MAKE) -f ../Makefile DOF=$(DBGF) TOPDIR=../${TOPDIR} \
THISDIR=../$(THISDIR)\
MAKEDEPEND=Makedepend $(PLUGIN)
THISDIR=../$(THISDIR)\
MAKEDEPEND=Makedepend $(PLUGIN)
@$(MAKE) LNSRC=$(DEBUGDIR)/$(PLUGIN) LNDEST=$(PLUGININST)/$(PLUGIN) __link
$(EXEC:=.opt) :
@[ -d $(OPTDIR) ] || mkdir $(OPTDIR)
@cd $(OPTDIR); \
$(MAKE) -f ../Makefile DOF=$(OPTF) TOPDIR=../${TOPDIR} \
THISDIR=../$(THISDIR)\
MAKEDEPEND=Makedepend $(EXEC)
THISDIR=../$(THISDIR)\
MAKEDEPEND=Makedepend $(EXEC)
@$(MAKE) LNSRC=$(OPTDIR)/$(EXEC) LNDEST=$(BININST)/$(EXEC) __link
$(LIB:=.opt) :
@[ -d $(OPTDIR) ] || mkdir $(OPTDIR)
@cd $(OPTDIR); \
@cd $(OPTDIR);\
$(MAKE) -f ../Makefile DOF=$(OPTF) TOPDIR=../${TOPDIR} \
THISDIR=../$(THISDIR)\
MAKEDEPEND=Makedepend $(LIB)
THISDIR=../$(THISDIR)\
MAKEDEPEND=Makedepend $(LIB)
@$(MAKE) LNSRC=$(OPTDIR)/$(LIB) LNDEST=$(LIBINST)/$(LIB) __link
$(PLUGIN:=.opt) :