summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2008-06-06 12:09:01 -0600
committerBrian Paul <brian.paul@tungstengraphics.com>2008-06-06 12:09:01 -0600
commitc9739b20555847c398e7b52fb0e580d86f958430 (patch)
tree54e52968cd4b270cd3e473f998ce2309983070f0 /src
parentf8563ddddb9edf056c3c0a5f676f93620c4ce37d (diff)
move directfb-libgl into drivers/directfb/Makefile
Diffstat (limited to 'src')
-rw-r--r--src/mesa/Makefile6
-rw-r--r--src/mesa/drivers/directfb/Makefile15
2 files changed, 14 insertions, 7 deletions
diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index b6485f39d3..d5866bb9f0 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -105,12 +105,6 @@ fbdev-driver: depend subdirs libmesa.a libglapi.a
#####################################################################
# DirectFB driver (libGL.so)
-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)
-
directfb-driver: depend subdirs directfb-libgl
cd drivers/directfb && $(MAKE)
diff --git a/src/mesa/drivers/directfb/Makefile b/src/mesa/drivers/directfb/Makefile
index dc71b385ca..945eb8b3d9 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)