diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2008-06-09 13:51:36 -0600 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2008-06-09 13:52:01 -0600 |
| commit | d7205ba971a348a57d50c331cb49afbd81067736 (patch) | |
| tree | c0cc9bbd36dcb02e5505b51a1d71a4ed1ed0c5cd /src | |
| parent | ac7f416bda4506583ef577d62fee4a4d0ce890c4 (diff) | |
Makefile clean-ups
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/drivers/directfb/Makefile | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/fbdev/Makefile | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/directfb/Makefile b/src/mesa/drivers/directfb/Makefile index 945eb8b3d9..ece0457cff 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 ac43dfdb67..c0ef54f604 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) \ |