$NetBSD: patch-at,v 1.1 2008/04/24 07:40:24 bjs Exp $

--- src/glx/x11/Makefile.orig	2007-11-01 11:30:52.000000000 -0400
+++ src/glx/x11/Makefile
@@ -53,10 +53,12 @@ INCLUDES = -I. \
 ##### RULES #####
 
 .c.o:
-	$(CC) -c $(INCLUDES) $(CFLAGS) $(EXTRA_DEFINES) $< -o $@
+	$(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(INCLUDES) \
+		$(CFLAGS) $(EXTRA_DEFINES) $< -o $(@:.o=.lo)
 
 .S.o:
-	$(CC) -c $(INCLUDES) $(CFLAGS) $(EXTRA_DEFINES)  $< -o $@
+	$(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(INCLUDES) \
+		$(CFLAGS) $(EXTRA_DEFINES)  $< -o $(@:.o=.lo)
 
 ##### TARGETS #####
 
@@ -64,9 +66,10 @@ default: depend $(TOP)/$(LIB_DIR)/$(GL_L
 
 # Make libGL
 $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME):  $(OBJECTS) Makefile
-	$(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
-		-major 1 -minor 2 $(MKLIB_OPTIONS) \
-		-install $(TOP)/$(LIB_DIR) $(GL_LIB_DEPS) $(OBJECTS)
+	$(LIBTOOL) --mode=link $(CC) \
+		-o $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME:.so=.la) \
+		$(LDFLAGS) -version-info 1:2 $(GL_LIB_DEPS) \
+		-rpath $(PREFIX)/lib $(OBJECTS:.o=.lo)
 
 
 depend: $(SOURCES) $(MESA_GLAPI_SOURCES) $(MESA_ASM_API) Makefile
