summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean D'Epagnier <geckosenator@freedesktop.org>2006-08-19 00:28:36 +0000
committerSean D'Epagnier <geckosenator@freedesktop.org>2006-08-19 00:28:36 +0000
commitc6fc82398722a165da4c5b89359035222b946d89 (patch)
treea40bb71fcc82042a2e599ab5b4177817e2333704
parentcf4d2f7109bf928d3b01684593bbe6ccf453de4b (diff)
Removed ifeq from makefile, and corrected fbdev driver so it compiles
-rw-r--r--src/mesa/Makefile12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 1d2f36f0fb..a0db296445 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -76,6 +76,7 @@ directfb: depend subdirs libgl-core
#####################################################################
# fbdev Mesa driver (libGL.so)
+FBDEV_DRIVER_OBJECTS = $(FBDEV_DRIVER_SOURCES:.c=.o) $(COMMON_DRIVER_SOURCES:.c=.o)
fbdev: $(CORE_OBJECTS) $(FBDEV_DRIVER_OBJECTS)
@ $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' \
@@ -83,21 +84,14 @@ fbdev: $(CORE_OBJECTS) $(FBDEV_DRIVER_OBJECTS)
-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
$(CORE_OBJECTS) $(FBDEV_DRIVER_OBJECTS) $(GL_LIB_DEPS)
-
######################################################################
# Stand-alone Mesa libGL and libOSMesa
-STAND_ALONE_DRIVER_SOURCES_A = \
+STAND_ALONE_DRIVER_SOURCES = \
$(COMMON_DRIVER_SOURCES) \
+ $(X11_DRIVER_SOURCES) \
$(GLIDE_DRIVER_SOURCES) \
$(SVGA_DRIVER_SOURCES)
-# if x11 is not installed, compiling with x11 sources will not work for fbdev
-ifeq ($(DRIVER_DIRS), fbdev)
-STAND_ALONE_DRIVER_SOURCES = $(STAND_ALONE_DRIVER_SOURCES_A) $(FBDEV_DRIVER_SOURCES)
-else
-STAND_ALONE_DRIVER_SOURCES = $(STAND_ALONE_DRIVER_SOURCES_A) $(X11_DRIVER_SOURCES)
-endif
-
STAND_ALONE_DRIVER_OBJECTS = $(STAND_ALONE_DRIVER_SOURCES:.c=.o)
STAND_ALONE_OBJECTS = \