diff options
| author | Brian Paul <[email protected]> | 2008-06-06 12:32:58 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2008-06-06 12:33:40 -0600 |
| commit | 53076e8b5bce9ddf6eb524b8009db67eb5d3389b (patch) | |
| tree | 76b39ce72140b1f83a7386931ce91126be8fbf4d /src/mesa/drivers/directfb | |
| parent | 463a47bf59398e850d5a6537da1186d855bd2919 (diff) | |
mesa: sync up with latest Makefile changes on master
Diffstat (limited to 'src/mesa/drivers/directfb')
| -rw-r--r-- | src/mesa/drivers/directfb/Makefile | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/mesa/drivers/directfb/Makefile b/src/mesa/drivers/directfb/Makefile index c515785b2a1..945eb8b3d9b 100644 --- a/src/mesa/drivers/directfb/Makefile +++ b/src/mesa/drivers/directfb/Makefile @@ -25,11 +25,24 @@ DIRECTFBGL_MESA_OBJECTS = $(DIRECTFBGL_MESA_SOURCES:.c=.o) DIRECTFBGL_MESA = libidirectfbgl_mesa.so +LIBS = $(TOP)/src/mesa/libmesa.a $(TOP)/src/mesa/libglapi.a + + .c.o: $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $(DFB_CFLAGS) $< -o $@ -default: directfbgl_mesa +default: directfb-libgl directfbgl_mesa + + +# XXX this used to be in src/mesa/Makefile and is probably broken now +directfb-libgl: $(CORE_OBJECTS) + @ $(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) \ + $(GL_LIB_DEPS) + + # Mesa DirectFBGL module directfbgl_mesa: $(DIRECTFBGL_MESA_OBJECTS) @@ -50,5 +63,5 @@ install: clean: - rm -f *.o *.so + -rm -f *.o *.so |