From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 9 Jun 2008 19:51:36 +0000 (-0600)
Subject: Makefile clean-ups
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d7205ba971a348a57d50c331cb49afbd81067736;p=mesa.git

Makefile clean-ups
---

diff --git a/src/mesa/drivers/directfb/Makefile b/src/mesa/drivers/directfb/Makefile
index 945eb8b3d9b..ece0457cffa 100644
--- a/src/mesa/drivers/directfb/Makefile
+++ b/src/mesa/drivers/directfb/Makefile
@@ -36,10 +36,10 @@ default: directfb-libgl directfbgl_mesa
 
 
 # XXX this used to be in src/mesa/Makefile and is probably broken now
-directfb-libgl: $(CORE_OBJECTS)
+directfb-libgl: $(LIBS)
 	@ $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
 		-major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
-		-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) $(CORE_OBJECTS) \
+		-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) $(LIBS) \
 		$(GL_LIB_DEPS)
 
 
diff --git a/src/mesa/drivers/fbdev/Makefile b/src/mesa/drivers/fbdev/Makefile
index ac43dfdb676..c0ef54f604f 100644
--- a/src/mesa/drivers/fbdev/Makefile
+++ b/src/mesa/drivers/fbdev/Makefile
@@ -24,7 +24,7 @@ CORE_MESA = $(TOP)/src/mesa/libmesa.a $(TOP)/src/mesa/libglapi.a
 default: $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
 
 
-$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(CORE_OBJECTS) $(OBJECTS)
+$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(CORE_MESA) $(OBJECTS)
 	@ $(TOP)/bin/mklib -o $(GL_LIB) \
 		-linker '$(CC)' -ldflags '$(LDFLAGS)' \
 		-major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \