Makefile clean-ups

diff --git a/src/mesa/drivers/directfb/Makefile b/src/mesa/drivers/directfb/Makefile
index 945eb8b3d9bad8ae02ef592f9968e531da976379..ece0457cffa7f62a8845bc61b4186c036132a07c 100644 (file)
--- 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 ac43dfdb676e9dab20c4871bb06a2edd8ea113d8..c0ef54f604f7e7b55410de175cc3a25d244faa40 100644 (file)
--- 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) \