summaryrefslogtreecommitdiff
path: root/src/glw
diff options
context:
space:
mode:
Diffstat (limited to 'src/glw')
-rw-r--r--src/glw/Makefile.X1115
-rw-r--r--src/glw/depend7
2 files changed, 11 insertions, 11 deletions
diff --git a/src/glw/Makefile.X11 b/src/glw/Makefile.X11
index a494e357f9..90b7f9d35f 100644
--- a/src/glw/Makefile.X11
+++ b/src/glw/Makefile.X11
@@ -7,10 +7,12 @@ MAJOR = 1
MINOR = 0
TINY = 0
+TOP = ../..
+
VPATH = RCS
-INCDIRS = -I../include -I/usr/include/Motif1.2 -I/usr/contrib/X11R6/include -I/usr/X11R6/include
-LIBDIR = ../lib
+INCDIRS = -I$(TOP)/include -I/usr/include/Motif1.2 -I/usr/contrib/X11R6/include -I/usr/X11R6/include
+LIBDIR = $(TOP)/lib
# Use these sources for Motif (and Xt) support. Requires Motif header files.
#SOURCES = GLwDrawA.c GLwMDrawA.c
@@ -43,9 +45,8 @@ targets: $(LIBDIR)/$(GLW_LIB) message
# Make the library
$(LIBDIR)/$(GLW_LIB): $(OBJECTS)
- $(MAKELIB) $(GLW_LIB) $(MAJOR) $(MINOR) $(TINY) $(OBJECTS)
- mv $(GLW_LIB)* $(LIBDIR)
- -mv *.a $(LIBDIR)
+ $(TOP)/bin/mklib -o GLw -major $(MAJOR) -minor $(MINOR) \
+ -patch $(TINY) $(GLW_LIB_DEPS) -install $(LIBDIR) $(OBJECTS)
message:
@@ -56,7 +57,7 @@ message:
@echo
-include ../Make-config
+include $(TOP)/Make-config
include depend
@@ -67,4 +68,4 @@ include depend
# by any source file.
#
dep: $(SOURCES)
- makedepend -fdepend -Y -I../include $(SOURCES)
+ makedepend -fdepend -Y -I$(TOP)/include $(SOURCES)
diff --git a/src/glw/depend b/src/glw/depend
index e0c23de53d..00bd839104 100644
--- a/src/glw/depend
+++ b/src/glw/depend
@@ -1,6 +1,5 @@
# DO NOT DELETE
-GLwDrawA.o: ../include/GL/glx.h ../include/GL/gl.h ../include/GL/xmesa.h
-GLwDrawA.o: GLwDrawAP.h GLwDrawA.h
-GLwMDrawA.o: GLwDrawA.c ../include/GL/glx.h ../include/GL/gl.h
-GLwMDrawA.o: ../include/GL/xmesa.h GLwDrawAP.h GLwDrawA.h GLwMDrawAP.h
+GLwDrawA.o: ../../include/GL/glx.h ../../include/GL/gl.h
+GLwDrawA.o: ../../include/GL/glext.h ../../include/GL/glxext.h GLwDrawAP.h
+GLwDrawA.o: GLwDrawA.h