new makefiles

diff --git a/progs/miniglx/Makefile.X11 b/progs/miniglx/Makefile.X11
deleted file mode 100644 (file)
index 60eda75..0000000
--- a/progs/miniglx/Makefile.X11
+++ /dev/null
@@ -1,64 +0,0 @@
-# Simple makefile for compiling test programs on Linux
-# These programs aren't intended to be included with the normal
-# distro.  They're not too interesting but they're good for testing.
-
-TOP = ../..
-
-default: linux-solo
-
-LIBS = $(APP_LIB_DEPS)
-
-SOURCES = miniglxtest.c \
-miniglxsample.c \
-sample_server.c \
-sample_server2.c \
-manytex.c \
-texline.c
-
-OBJECTS = $(SOURCES:.c=.o)
-
-PROGS = $(SOURCES:%.c=%)
-
-INCLUDES = \
-       -I. \
-       -I$(TOP)/include
-
-##### RULES #####
-
-.SUFFIXES:
-.SUFFIXES: .c
-
-.c:
-       $(CC) $(INCLUDES) $(CFLAGS) $< $(LIBS) -o $@
-
-.c.o:
-       $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
-
-.S.o:
-       $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES)  $< -o $@
-
-
-##### TARGETS #####
-
-targets:  depend $(PROGS)
-
-clean:
-       rm -f $(PROGS)
-       rm -f *.o
-
-
-# Run 'make -f Makefile.X11 dep' to update the dependencies if you change
-# what's included by any source file.
-depend: $(SOURCES)
-       makedepend -fdepend -Y $(INCLUDES) \
-               $(SOURCES)
-
-
-# Emacs tags
-tags:
-       etags `find . -name \*.[ch]` `find ../include`
-
-
-include $(TOP)/Make-config
-
-include depend

diff --git a/progs/miniglx/Makefile.solo b/progs/miniglx/Makefile.solo
new file mode 100644 (file)
index 0000000..0cca1e0
--- /dev/null
+++ b/progs/miniglx/Makefile.solo
@@ -0,0 +1,62 @@
+# Makefile for miniglx demo programs
+
+TOP = ../..
+
+default: linux-solo
+
+LIBS = $(APP_LIB_DEPS)
+
+SOURCES = miniglxtest.c \
+miniglxsample.c \
+sample_server.c \
+sample_server2.c \
+manytex.c \
+texline.c
+
+OBJECTS = $(SOURCES:.c=.o)
+
+PROGS = $(SOURCES:%.c=%)
+
+INCLUDES = \
+       -I. \
+       -I$(TOP)/include
+
+##### RULES #####
+
+.SUFFIXES:
+.SUFFIXES: .c
+
+.c:
+       $(CC) $(INCLUDES) $(CFLAGS) $< $(LIBS) -o $@
+
+.c.o:
+       $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
+
+.S.o:
+       $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES)  $< -o $@
+
+
+##### TARGETS #####
+
+targets:  depend $(PROGS)
+
+clean:
+       rm -f $(PROGS)
+       rm -f *.o
+
+
+# Run 'make -f Makefile.solo dep' to update the dependencies if you change
+# what's included by any source file.
+depend: $(SOURCES)
+       makedepend -fdepend -Y $(INCLUDES) \
+               $(SOURCES)
+
+
+# Emacs tags
+tags:
+       etags `find . -name \*.[ch]` `find ../include`
+
+
+include $(TOP)/Make-config
+
+include depend

diff --git a/src/glut/mini/Makefile.X11 b/src/glut/mini/Makefile.X11
deleted file mode 100644 (file)
index bbdc6a6..0000000
--- a/src/glut/mini/Makefile.X11
+++ /dev/null
@@ -1,78 +0,0 @@
-
-TOP = ../../..
-
-default: linux-solo
-
-MARK = $(TOP)/src/glut/glx
-
-INCLUDES = -I$(TOP)/include -I$(MARK)
-
-CORE_SOURCES = \
-       bitmap.c \
-       callback.c \
-       color.c \
-       globals.c \
-       init.c \
-       menu.c \
-       models.c \
-       overlay.c \
-       state.c \
-       teapot.c \
-       window.c
-
-
-MARK_SOURCES = \
-       $(MARK)/glut_8x13.c \
-       $(MARK)/glut_9x15.c \
-       $(MARK)/glut_hel10.c \
-       $(MARK)/glut_hel12.c \
-       $(MARK)/glut_hel18.c \
-       $(MARK)/glut_tr10.c \
-       $(MARK)/glut_tr24.c
-
-SOURCES = $(CORE_SOURCES)  $(MARK_SOURCES)
-
-OBJS =  $(SOURCES:.c=.o)
-
-LIBS = -L$(TOP)/lib -lGL -lGLU -lm
-
-##### RULES #####
-
-.c.o:
-       $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
-
-.S.o:
-       $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES)  $< -o $@
-
-
-##### TARGETS #####
-
-targets: depend libglut.so.3.7 install 
-
-libglut.so.3.7: $(OBJS) Makefile.X11
-       gcc -shared -Wl,-soname,libglut.so -Wl,-Bsymbolic $(OBJS) $(LIBS) -o $@ 
-
-install: libglut.so.3.7
-       rm -f $(TOP)/lib/libglut.so*
-       install -D libglut.so.3.7 $(TOP)/lib/libglut.so.3.7
-       ln -s libglut.so.3.7 $(TOP)/lib/libglut.so.3
-       ln -s libglut.so.3 $(TOP)/lib/libglut.so
-
-# Run 'make -f Makefile.X11 dep' to update the dependencies if you change
-# what's included by any source file.
-depend: $(SOURCES) 
-       makedepend -fdepend -Y $(INCLUDES) \
-               $(SOURCES)
-
-# Emacs tags
-tags:
-       etags `find . -name \*.[ch]` `find ../include`
-
-
-# Remove .o and backup files
-clean: depend
-       -rm -f *.o *~ *.o *~ *.so libglut.so.3.7
-
-include $(TOP)/Make-config
-
-include depend

diff --git a/src/glut/mini/Makefile.solo b/src/glut/mini/Makefile.solo
new file mode 100644 (file)
index 0000000..f413ed1
--- /dev/null
+++ b/src/glut/mini/Makefile.solo
@@ -0,0 +1,78 @@
+
+TOP = ../../..
+
+default: linux-solo
+
+MARK = $(TOP)/src/glut/glx
+
+INCLUDES = -I$(TOP)/include -I$(MARK)
+
+CORE_SOURCES = \
+       bitmap.c \
+       callback.c \
+       color.c \
+       globals.c \
+       init.c \
+       menu.c \
+       models.c \
+       overlay.c \
+       state.c \
+       teapot.c \
+       window.c
+
+
+MARK_SOURCES = \
+       $(MARK)/glut_8x13.c \
+       $(MARK)/glut_9x15.c \
+       $(MARK)/glut_hel10.c \
+       $(MARK)/glut_hel12.c \
+       $(MARK)/glut_hel18.c \
+       $(MARK)/glut_tr10.c \
+       $(MARK)/glut_tr24.c
+
+SOURCES = $(CORE_SOURCES)  $(MARK_SOURCES)
+
+OBJS =  $(SOURCES:.c=.o)
+
+LIBS = -L$(TOP)/lib -lGL -lGLU -lm
+
+##### RULES #####
+
+.c.o:
+       $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
+
+.S.o:
+       $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES)  $< -o $@
+
+
+##### TARGETS #####
+
+targets: depend libglut.so.3.7 install 
+
+libglut.so.3.7: $(OBJS) Makefile.solo
+       gcc -shared -Wl,-soname,libglut.so -Wl,-Bsymbolic $(OBJS) $(LIBS) -o $@ 
+
+install: libglut.so.3.7
+       rm -f $(TOP)/lib/libglut.so*
+       install -D libglut.so.3.7 $(TOP)/lib/libglut.so.3.7
+       ln -s libglut.so.3.7 $(TOP)/lib/libglut.so.3
+       ln -s libglut.so.3 $(TOP)/lib/libglut.so
+
+# Run 'make -f Makefile.solo dep' to update the dependencies if you change
+# what's included by any source file.
+depend: $(SOURCES) 
+       makedepend -fdepend -Y $(INCLUDES) \
+               $(SOURCES)
+
+# Emacs tags
+tags:
+       etags `find . -name \*.[ch]` `find ../include`
+
+
+# Remove .o and backup files
+clean: depend
+       -rm -f *.o *~ *.o *~ *.so libglut.so.3.7
+
+include $(TOP)/Make-config
+
+include depend

diff --git a/src/glx/mini/Makefile.X11 b/src/glx/mini/Makefile.X11
deleted file mode 100644 (file)
index 1158543..0000000
--- a/src/glx/mini/Makefile.X11
+++ /dev/null
@@ -1,80 +0,0 @@
-# Build a subset DRI-based libGL.so library.
-# Indirect rendering not supported, etc.
-
-TOP = ../../..
-
-default: linux-solo
-
-C_SOURCES = dispatch.c \
-         dri_util.c \
-         ../../mesa/glapi/glapi.c \
-         ../../mesa/glapi/glthread.c \
-         miniglx.c \
-         miniglx_events.c \
-         xf86drm.c 
-
-OBJECTS = $(C_SOURCES:.c=.o)
-
-INCLUDES = -I. $(INCLUDE_DIRS)
-LIBS = -ldl 
-
-### Include directories
-
-INCLUDE_DIRS = \
-       -I$(TOP)/include \
-       -I$(TOP)/src/mesa \
-       -I$(TOP)/src/mesa/main \
-       -I$(TOP)/src/mesa/glapi \
-       -I$(TOP)/src/mesa/math \
-       -I$(TOP)/src/mesa/transform \
-       -I$(TOP)/src/mesa/swrast \
-       -I$(TOP)/src/mesa/swrast_setup
-
-
-##### RULES #####
-
-.c.o:
-       $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
-
-.S.o:
-       $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES)  $< -o $@
-
-
-##### TARGETS #####
-
-targets: depend libGL.so.1.2
-
-libGL.so.1.2:  $(OBJECTS) Makefile.X11
-       rm -f $@ && gcc -shared -Wl,-soname,libGL.so -Wl,-Bsymbolic $(OBJECTS) $(LIBS) -o $@ 
-       rm -f $(TOP)/lib/libGL.so* 
-       rm -f $(TOP)/lib/miniglx.conf
-       install -D libGL.so.1.2 $(TOP)/lib/libGL.so.1.2
-       ln -s libGL.so.1.2 $(TOP)/lib/libGL.so.1
-       ln -s libGL.so.1 $(TOP)/lib/libGL.so
-       install example.miniglx.conf $(TOP)/lib/miniglx.conf
-
-drmtest: xf86drm.o drmtest.o
-       rm -f drmtest && $(CC) -o drmtest xf86drm.o drmtest.o
-
-# Run 'make -f Makefile.X11 dep' to update the dependencies if you change
-# what's included by any source file.
-depend: $(C_SOURCES) $(ASM_SOURCES)
-       makedepend -fdepend -Y $(INCLUDES) \
-               $(C_SOURCES) $(ASM_SOURCES)
-
-
-# Emacs tags
-tags:
-       etags `find . -name \*.[ch]` `find ../include`
-
-
-# Remove .o and backup files
-clean:
-       -rm -f drmtest $(TOP)/lib/libGL.so*
-       -rm -f libGL.so*
-       -rm -f *.o *~
-
-
-include $(TOP)/Make-config
-
-include depend

diff --git a/src/glx/mini/Makefile.solo b/src/glx/mini/Makefile.solo
new file mode 100644 (file)
index 0000000..94e54f4
--- /dev/null
+++ b/src/glx/mini/Makefile.solo
@@ -0,0 +1,80 @@
+# Build a subset DRI-based libGL.so library.
+# Indirect rendering not supported, etc.
+
+TOP = ../../..
+
+default: linux-solo
+
+C_SOURCES = dispatch.c \
+         dri_util.c \
+         ../../mesa/glapi/glapi.c \
+         ../../mesa/glapi/glthread.c \
+         miniglx.c \
+         miniglx_events.c \
+         xf86drm.c 
+
+OBJECTS = $(C_SOURCES:.c=.o)
+
+INCLUDES = -I. $(INCLUDE_DIRS)
+LIBS = -ldl 
+
+### Include directories
+
+INCLUDE_DIRS = \
+       -I$(TOP)/include \
+       -I$(TOP)/src/mesa \
+       -I$(TOP)/src/mesa/main \
+       -I$(TOP)/src/mesa/glapi \
+       -I$(TOP)/src/mesa/math \
+       -I$(TOP)/src/mesa/transform \
+       -I$(TOP)/src/mesa/swrast \
+       -I$(TOP)/src/mesa/swrast_setup
+
+
+##### RULES #####
+
+.c.o:
+       $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
+
+.S.o:
+       $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES)  $< -o $@
+
+
+##### TARGETS #####
+
+targets: depend libGL.so.1.2
+
+libGL.so.1.2:  $(OBJECTS) Makefile.solo
+       rm -f $@ && gcc -shared -Wl,-soname,libGL.so -Wl,-Bsymbolic $(OBJECTS) $(LIBS) -o $@ 
+       rm -f $(TOP)/lib/libGL.so* 
+       rm -f $(TOP)/lib/miniglx.conf
+       install -D libGL.so.1.2 $(TOP)/lib/libGL.so.1.2
+       ln -s libGL.so.1.2 $(TOP)/lib/libGL.so.1
+       ln -s libGL.so.1 $(TOP)/lib/libGL.so
+       install example.miniglx.conf $(TOP)/lib/miniglx.conf
+
+drmtest: xf86drm.o drmtest.o
+       rm -f drmtest && $(CC) -o drmtest xf86drm.o drmtest.o
+
+# Run 'make -f Makefile.solo dep' to update the dependencies if you change
+# what's included by any source file.
+depend: $(C_SOURCES) $(ASM_SOURCES)
+       makedepend -fdepend -Y $(INCLUDES) \
+               $(C_SOURCES) $(ASM_SOURCES)
+
+
+# Emacs tags
+tags:
+       etags `find . -name \*.[ch]` `find ../include`
+
+
+# Remove .o and backup files
+clean:
+       -rm -f drmtest $(TOP)/lib/libGL.so*
+       -rm -f libGL.so*
+       -rm -f *.o *~
+
+
+include $(TOP)/Make-config
+
+include depend