Renaming Makefile to Makefile.X11, added depend support, adjusted paths

diff --git a/progs/miniglx/Makefile b/progs/miniglx/Makefile
deleted file mode 100644 (file)
index 5a78139..0000000
--- a/progs/miniglx/Makefile
+++ /dev/null
@@ -1,31 +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 = ../..
-
-CC = gcc
-CFLAGS = -g -I$(TOP)/include
-LIBS = -L$(TOP)/lib -lGL -lGLU -lglut -lm -Wl,-rpath,$(TOP)/lib
-
-PROGS = miniglxtest miniglxsample sample_server sample_server2 manytex texline
-
-
-##### RULES #####
-
-.SUFFIXES:
-.SUFFIXES: .c
-
-.c:
-       $(CC) $(CFLAGS) $< $(LIBS) -o $@
-
-
-##### TARGETS #####
-
-default: $(PROGS)
-
-clean:
-       rm -f $(PROGS)
-       rm -f *.o
-

diff --git a/progs/miniglx/Makefile.X11 b/progs/miniglx/Makefile.X11
new file mode 100644 (file)
index 0000000..60eda75
--- /dev/null
+++ b/progs/miniglx/Makefile.X11
@@ -0,0 +1,64 @@
+# 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