From f226191d52b98eab83a1761f48c88688a4a27408 Mon Sep 17 00:00:00 2001 From: Philippe Houdoin Date: Sat, 14 Aug 2004 14:27:32 +0000 Subject: Remove obsoleted BeOS-specific makefiles. Add a makefile to build old Mesa GLU, whatever it worth. Add a guard to stop building libGLU.so on BeOS, as it's build into libGL.so. --- src/glu/mesa/Makefile | 56 ++++++++++++++++++++++++++++++++ src/glu/mesa/Makefile.BeOS | 73 ----------------------------------------- src/glu/mesa/Makefile.BeOS-R4 | 75 ------------------------------------------- 3 files changed, 56 insertions(+), 148 deletions(-) create mode 100644 src/glu/mesa/Makefile delete mode 100644 src/glu/mesa/Makefile.BeOS delete mode 100644 src/glu/mesa/Makefile.BeOS-R4 (limited to 'src') diff --git a/src/glu/mesa/Makefile b/src/glu/mesa/Makefile new file mode 100644 index 0000000000..6a48077e95 --- /dev/null +++ b/src/glu/mesa/Makefile @@ -0,0 +1,56 @@ +# src/glu/mesa/Makefile + +TOP = ../../.. + +include $(TOP)/configs/current + +GLU_MAJOR = 1 +GLU_MINOR = 1 +GLU_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY) + +C_SOURCES = \ + glu.c \ + mipmap.c \ + nurbs.c \ + nurbscrv.c \ + nurbssrf.c \ + nurbsutl.c \ + polytest.c \ + project.c \ + quadric.c \ + tess.c \ + tesselat.c + +OBJECTS = $(C_SOURCES:.c=.o) + +INCLUDES = -I. -I- -I$(TOP)/include + +##### RULES ##### + +.c.o: + $(CC) -c $(INCLUDES) $(CFLAGS) $< -o $@ + +##### TARGETS ##### + +default: + @if [ "${CONFIG_NAME}" = "beos" ] ; then \ + echo "GLU library not build under BeOS: integrated into ${LIB_DIR}/${GL_LIB_NAME} library." ; \ + exit 0 ; \ + else \ + $(MAKE) "${LIB_DIR}/${GLU_LIB_NAME}" ; \ + fi + +$(LIB_DIR): + -mkdir $(LIB_DIR) + +# Make the library: +$(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS) + @CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(GLU_LIB) -major $(GLU_MAJOR) \ + -minor $(GLU_MINOR) -patch $(GLU_TINY) \ + $(MKLIB_OPTIONS) -install $(LIB_DIR) \ + $(GLU_LIB_DEPS) $(OBJECTS) + +clean: + -rm -f *.o */*.o */*/*.o + -rm -f *.lo */*.lo */*/*.lo + -rm -f *.la */*.la */*/*.la diff --git a/src/glu/mesa/Makefile.BeOS b/src/glu/mesa/Makefile.BeOS deleted file mode 100644 index 71624e392c..0000000000 --- a/src/glu/mesa/Makefile.BeOS +++ /dev/null @@ -1,73 +0,0 @@ -# Makefile for GLU for BeOS contributed by -# Tinic Uro <5uro@informatik.uni-hamburg.de> - -# Mesa 3-D graphics library -# Version: 3.3 -# Copyright (C) 1995-2000 Brian Paul -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Library General Public -# License as published by the Free Software Foundation; either -# version 2 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Library General Public License for more details. -# -# You should have received a copy of the GNU Library General Public -# License along with this library; if not, write to the Free -# Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - - -##### MACROS ##### - -VPATH = RCS - -INCDIR = ../include -LIBDIR = ../lib - -SOURCES = glu.c mipmap.c nurbs.c nurbscrv.c nurbssrf.c nurbsutl.c \ - polytest.c project.c quadric.c tess.c tesselat.c - -OBJECTS = $(SOURCES:.c=.o) - - - -##### RULES ##### - -.c.o: - $(CC) -c -i . -i- -i $(INCDIR) $(CFLAGS) $< - - - -##### TARGETS ##### - -default: - @echo "Specify a target configuration" - -clean: - -rm *.o *~ - -targets: $(LIBDIR)/$(GLU_LIB) - -# Make the library: -$(LIBDIR)/$(GLU_LIB): $(OBJECTS) - $(MAKELIB) $(GLU_LIB) $(MAJOR) $(MINOR) $(TINY) $(OBJECTS) -# $(RANLIB) $(GLU_LIB) - mv $(GLU_LIB)* $(LIBDIR) - -include ../Make-config - -include depend - - - -# -# Run 'make depend' to update the dependencies if you change what's included -# by any source file. -# -depend: $(SOURCES) - makedepend -fdepend -Y -I../include $(SOURCES) - diff --git a/src/glu/mesa/Makefile.BeOS-R4 b/src/glu/mesa/Makefile.BeOS-R4 deleted file mode 100644 index 99cff18f86..0000000000 --- a/src/glu/mesa/Makefile.BeOS-R4 +++ /dev/null @@ -1,75 +0,0 @@ -# Makefile for GLU for BeOS R4 - -# Mesa 3-D graphics library -# Version: 3.3 -# Copyright (C) 1995-2000 Brian Paul -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Library General Public -# License as published by the Free Software Foundation; either -# version 2 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Library General Public License for more details. -# -# You should have received a copy of the GNU Library General Public -# License along with this library; if not, write to the Free -# Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - - -##### MACROS ##### - -GLU_MAJOR = 1 -GLU_MINOR = 1 -GLU_TINY = $(MESA_MAJOR)$(MESA_MINOR)$(MESA_TINY) - -VPATH = RCS - -INCDIR = ../include -LIBDIR = ../lib - -SOURCES = glu.c mipmap.c nurbs.c nurbscrv.c nurbssrf.c nurbsutl.c \ - polytest.c project.c quadric.c tess.c tesselat.c - -OBJECTS = $(SOURCES:.c=.o) - - - -##### TARGETS ##### - -default: - @echo "Specify a target configuration" - -clean: - -rm *.o *~ - -targets: $(LIBDIR)/$(GLU_LIB) - -# Make the library: -$(LIBDIR)/$(GLU_LIB): $(OBJECTS) - $(MAKELIB) $(GLU_LIB) $(GLU_MAJOR) $(GLU_MINOR) $(GLU_TINY) -L$(LIBDIR) -lGL $(OBJECTS) - mv $(GLU_LIB)* $(LIBDIR) - -include ../Make-config - -include depend - - - -##### RULES ##### - -.c.o: - $(CC) -c -I. -I../ -I$(INCDIR) $(CFLAGS) $< - - - -# -# Run 'make depend' to update the dependencies if you change what's included -# by any source file. -# -depend: $(SOURCES) - makedepend -fdepend -Y -I../include $(SOURCES) - -- cgit v1.2.3