2 files changed, 6 insertions, 64 deletions
diff --git a/progs/samples/Makefile b/progs/samples/Makefile
index d7fcf8709d6..463fd5a0c57 100644
--- a/progs/samples/Makefile
+++ b/progs/samples/Makefile
@@ -8,9 +8,14 @@ INCDIR = $(TOP)/include
 LIB_DEP = $(LIB_DIR)/$(GL_LIB_NAME) $(LIB_DIR)/$(GLU_LIB_NAME) $(LIB_DIR)/$(GLUT_LIB_NAME)
 
 PROGS = accum bitmap1 bitmap2 blendeq blendxor copy cursor depth eval fog \
-	font line logo nurb oglinfo olympic overlay point prim quad select \
+	font line logo nurb olympic overlay point prim quad select \
 	shape sphere star stencil stretch texture tri wave
 
+ifeq ($(CONFIG_NAME), beos)
+	LIB_DEP = $(APP_LIB_DEPS)
+else
+	PROGS += oglinfo
+endif
 
 ##### RULES #####
 
diff --git a/progs/samples/Makefile.BeOS-R4 b/progs/samples/Makefile.BeOS-R4
deleted file mode 100644
index 97de22e60c2..00000000000
--- a/progs/samples/Makefile.BeOS-R4
+++ /dev/null
@@ -1,63 +0,0 @@
-
-# Mesa 3-D graphics library
-# Version:  3.1
-# Copyright (C) 1995-1999  Brian Paul
-#
-# This file is in the public domain.
-
-
-# Makefile for sample programs for BeOS R4
-
-
-
-
-##### MACROS #####
-
-INCDIR = ../include
-LIBDIR = ../lib
-
-GL_LIBS = -L$(LIBDIR) -L/boot/home/config/lib -Xlinker -rpath $(LIBDIR) -lbe -lglut -lGLU -lGL $(XLIBS)
-
-LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLUT_LIB)
-
-PROGS = accum bitmap1 bitmap2 blendeq blendxor copy cursor depth eval fog \
-	font line logo olympic overlay point prim select \
-	shape sphere star stencil stretch texture tri wave
-
-
-##### RULES #####
-
-.SUFFIXES:
-.SUFFIXES: .c
-
-.c: $(LIB_DEP)
-	$(CC) -I$(INCDIR) $(CFLAGS) $< $(GL_LIBS) -o $@
-
-
-
-##### TARGETS #####
-
-default:
-	@echo "Specify a target configuration"
-
-clean:
-	-rm *.o *~
-
-realclean:
-	-rm $(PROGS)
-	-rm *.o *~
-
-targets: $(PROGS)
-
-# execute all programs
-exec: $(PROGS)
-	@for prog in $(PROGS) ;			\
-	do					\
-		echo -n "Running $$prog ..." ;	\
-		$$prog ;			\
-		echo ;				\
-	done
-
-
-include ../Make-config
-