diff -ru glass-1.3.1-orig/Makefile glass-1.3.1/Makefile --- glass-1.3.1-orig/Makefile Thu Mar 27 15:50:01 2003 +++ glass-1.3.1/Makefile Thu Mar 27 16:48:36 2003 @@ -1,36 +1,19 @@ -LIBDIR = /usr/local/lib -INCLUDEDIR = /usr/local/include/glass +LIBDIR = $(prefix)/lib +INCLUDEDIR = $(prefix)/include/glass +DOCDIR = $(prefix)/share/doc/glass VERSION = 1.3.1 GLASS=glass-$(VERSION) TMPDIR=/tmp/$(GLASS) all: - cd src/ && make && chmod 644 libglass.so.$(VERSION) && mv libglass.so.$(VERSION) .. + cd src && make install: mkdir -p $(INCLUDEDIR) - cp -f src/glass.h $(INCLUDEDIR) && \ - rm -f $(LIBDIR)/libglass.* && \ - cp -f libglass.so.$(VERSION) $(LIBDIR) && \ - ln -fs libglass.so.1 $(LIBDIR)/libglass.so && /sbin/ldconfig + mkdir -p $(LIBDIR) + mkdir -p $(DOCDIR) + cp src/glass.h $(INCLUDEDIR) + cp -R src/libglass.a src/libglass*.dylib $(LIBDIR) + cp -R examples $(DOCDIR) -clean: - rm -f libglass.so.* *~ .*~ && cd src && make clean && cd ../docs && make clean - -release: -# Copy to /tmp - rm -fr $(TMPDIR) - cp -r ../glass/ $(TMPDIR) - -# Clean the source - cd $(TMPDIR) && make clean - cd $(TMPDIR)/examples && make clean - cd $(TMPDIR)/docs && make clean - -# Remove CVS stuff - cd $(TMPDIR) && rm -rf CVS/ src/CVS/ docs/CVS/ examples/CVS \ - examples/models/CVS examples/src/CVS \ - .cvsignore src/.cvsignore examples/.cvsignore - -# Package up - cd $(TMPDIR)/.. && tar cfvz $(GLASS).tar.gz $(GLASS) +.PHONY: all install \ No newline at end of file Only in glass-1.3.1: Makefile~ diff -ru glass-1.3.1-orig/examples/src/Makefile glass-1.3.1/examples/src/Makefile --- glass-1.3.1-orig/examples/src/Makefile Thu Mar 27 15:50:01 2003 +++ glass-1.3.1/examples/src/Makefile Thu Mar 27 17:06:53 2003 @@ -1,6 +1,6 @@ CC = gcc -CFLAGS = -g -Wall -LIBS = -lglut -lGLU -lGL -lXmu -lXi -lXext -lX11 -lm -lglass -L/usr/X11R6/lib +CFLAGS = -g -Wall -I/usr/X11R6/include -IPREFIX/include +LIBS = -LPREFIX/lib -lglut -lGLU -lGL -lXmu -lXi -lXext -lX11 -lm -lglass -L/usr/X11R6/lib EXAMPLES = hello viewer runningman apoint all: $(EXAMPLES) Only in glass-1.3.1/examples/src: Makefile~ diff -ru glass-1.3.1-orig/src/Makefile glass-1.3.1/src/Makefile --- glass-1.3.1-orig/src/Makefile Thu Mar 27 15:50:01 2003 +++ glass-1.3.1/src/Makefile Thu Mar 27 16:16:00 2003 @@ -1,12 +1,29 @@ CC = gcc +GLASS_MAJOR = 1 GLASS_VERSION = 1.3.1 -CFLAGS = -g -Wall -DVERSION_STRING=\"$(GLASS_VERSION)\" -LIBS = -lGL +CFLAGS = -g -Wall -DVERSION_STRING=\"$(GLASS_VERSION)\" -I/usr/X11R6/include +LIBS = -L/usr/X11R6/lib -lGL OBJS = glass_apoint.o glass_draw.o glass_interface.o glass_library.o \ glass_load.o glass_material.o glass_model.o glass_node.o glass_rgb.o \ glass_surface.o glass_texture.o glass_transform.o glass_triangle.o glass_variable.o -all: $(OBJS) - $(CC) -shared -Wl,-soname,libglass.so.1 -o libglass.so.$(GLASS_VERSION) $(OBJS) -lc +all: libglass.a libglass.dylib + +libglass.a: $(OBJS) + ar cr $@ $(OBJS) + ranlib $@ + +libglass.dylib: libglass.$(GLASS_MAJOR).dylib + ln -sf $< $@ + +libglass.$(GLASS_MAJOR).dylib: libglass.$(GLASS_VERSION).dylib + ln -sf $< $@ + +libglass.$(GLASS_VERSION).dylib: $(OBJS) + $(CC) -dynamiclib \ + -install_name $(prefix)/lib/libglass.$(GLASS_MAJOR).dylib \ + -compatibility_version $(GLASS_VERSION) \ + -current_version $(GLASS_VERSION) \ + -o $@ $(OBJS) $(LIBS) glass_apoint.o: glass_apoint.c glass.h glass_model.h glass_library.h \ glass_texture.h glass_material.h glass_surface.h glass_triangle.h \ Only in glass-1.3.1/src: Makefile~ diff -ru glass-1.3.1-orig/src/glass_apoint.c glass-1.3.1/src/glass_apoint.c --- glass-1.3.1-orig/src/glass_apoint.c Thu Mar 27 15:50:01 2003 +++ glass-1.3.1/src/glass_apoint.c Thu Mar 27 16:09:16 2003 @@ -19,7 +19,6 @@ */ #include -#include #include #include "global.h" Only in glass-1.3.1/src: glass_apoint.c~ diff -ru glass-1.3.1-orig/src/glass_library.c glass-1.3.1/src/glass_library.c --- glass-1.3.1-orig/src/glass_library.c Thu Mar 27 15:50:01 2003 +++ glass-1.3.1/src/glass_library.c Thu Mar 27 16:12:32 2003 @@ -19,7 +19,6 @@ */ #include -#include #include #include "global.h" Only in glass-1.3.1/src: glass_library.c~ diff -ru glass-1.3.1-orig/src/glass_material.c glass-1.3.1/src/glass_material.c --- glass-1.3.1-orig/src/glass_material.c Thu Mar 27 15:50:01 2003 +++ glass-1.3.1/src/glass_material.c Thu Mar 27 16:12:42 2003 @@ -19,7 +19,6 @@ */ #include -#include #include #include "global.h" Only in glass-1.3.1/src: glass_material.c~ diff -ru glass-1.3.1-orig/src/glass_model.c glass-1.3.1/src/glass_model.c --- glass-1.3.1-orig/src/glass_model.c Thu Mar 27 15:50:01 2003 +++ glass-1.3.1/src/glass_model.c Thu Mar 27 16:12:52 2003 @@ -19,7 +19,6 @@ */ #include -#include #include #include "global.h" Only in glass-1.3.1/src: glass_model.c~ diff -ru glass-1.3.1-orig/src/glass_node.c glass-1.3.1/src/glass_node.c --- glass-1.3.1-orig/src/glass_node.c Thu Mar 27 15:50:01 2003 +++ glass-1.3.1/src/glass_node.c Thu Mar 27 16:13:04 2003 @@ -19,7 +19,6 @@ */ #include -#include #include "global.h" #include "glass_node.h" Only in glass-1.3.1/src: glass_node.c~ diff -ru glass-1.3.1-orig/src/glass_surface.c glass-1.3.1/src/glass_surface.c --- glass-1.3.1-orig/src/glass_surface.c Thu Mar 27 15:50:01 2003 +++ glass-1.3.1/src/glass_surface.c Thu Mar 27 16:13:15 2003 @@ -19,7 +19,6 @@ */ #include -#include #include #include "global.h" Only in glass-1.3.1/src: glass_surface.c~ diff -ru glass-1.3.1-orig/src/glass_texture.c glass-1.3.1/src/glass_texture.c --- glass-1.3.1-orig/src/glass_texture.c Thu Mar 27 15:50:01 2003 +++ glass-1.3.1/src/glass_texture.c Thu Mar 27 16:13:25 2003 @@ -19,7 +19,6 @@ */ #include -#include #include #include "global.h" Only in glass-1.3.1/src: glass_texture.c~ diff -ru glass-1.3.1-orig/src/glass_transform.c glass-1.3.1/src/glass_transform.c --- glass-1.3.1-orig/src/glass_transform.c Thu Mar 27 15:50:01 2003 +++ glass-1.3.1/src/glass_transform.c Thu Mar 27 16:13:40 2003 @@ -19,7 +19,6 @@ */ #include -#include #include "global.h" #include "glass_transform.h" Only in glass-1.3.1/src: glass_transform.c~ diff -ru glass-1.3.1-orig/src/glass_triangle.c glass-1.3.1/src/glass_triangle.c --- glass-1.3.1-orig/src/glass_triangle.c Thu Mar 27 15:50:01 2003 +++ glass-1.3.1/src/glass_triangle.c Thu Mar 27 16:13:52 2003 @@ -19,7 +19,6 @@ */ #include -#include #include #include "global.h" Only in glass-1.3.1/src: glass_triangle.c~ diff -ru glass-1.3.1-orig/src/glass_variable.c glass-1.3.1/src/glass_variable.c --- glass-1.3.1-orig/src/glass_variable.c Thu Mar 27 15:50:01 2003 +++ glass-1.3.1/src/glass_variable.c Thu Mar 27 16:15:02 2003 @@ -19,7 +19,6 @@ */ #include -#include #include #include "global.h" Only in glass-1.3.1/src: glass_variable.c~ diff -ru glass-1.3.1-orig/src/global.h glass-1.3.1/src/global.h --- glass-1.3.1-orig/src/global.h Thu Mar 27 15:50:01 2003 +++ glass-1.3.1/src/global.h Thu Mar 27 16:15:11 2003 @@ -23,6 +23,7 @@ #include #include +#include typedef int boolean; Only in glass-1.3.1/src: global.h~