lots of Makefile updates for new build system

[mesa.git] / src / mesa / drivers / dri / fb / Makefile

diff --git a/src/mesa/drivers/dri/fb/Makefile b/src/mesa/drivers/dri/fb/Makefile
index 2d1253e04bdcbd35092171765da0836e0a52e4df..6d292aa3e08de16e5ca574487f3bfe06db3604c7 100644 (file)
--- a/src/mesa/drivers/dri/fb/Makefile
+++ b/src/mesa/drivers/dri/fb/Makefile
@@ -1,66 +1,70 @@
 # src/mesa/drivers/dri/fb/Makefile
 
 TOP = ../../../../..
-include $(TOP)/configs/default
+include $(TOP)/configs/current
 
-SHARED_INCLUDES = $(INCLUDE_DIRS) -I. -I../common -Iserver
-MINIGLX_INCLUDES = -I$(TOP)/src/glx/mini
-
-MESA_MODULES = $(TOP)/src/mesa/mesa.a
+LIBNAME = fb_dri.so
 
 DRIVER_SOURCES = fb_dri.c
 
-
-C_SOURCES = $(DRIVER_SOURCES) \
-           $(DRI_SOURCES) 
-
-ASM_SOURCES = 
-
-OBJECTS = $(C_SOURCES:.c=.o) \
-         $(ASM_SOURCES:.S=.o) 
+C_SOURCES = \
+       $(DRIVER_SOURCES) \
+       $(DRI_SOURCES) 
 
 
-### Include directories
-
+# Include directories
 INCLUDE_DIRS = \
+       -I. \
+       -I../common \
+       -Iserver \
+       -I$(TOP)/src/glx/mini \
        -I$(TOP)/include \
+       -I$(TOP)/src/mesa/drivers/dri/drm/shared \
        -I$(TOP)/src/mesa \
        -I$(TOP)/src/mesa/main \
        -I$(TOP)/src/mesa/glapi \
        -I$(TOP)/src/mesa/math \
        -I$(TOP)/src/mesa/transform \
+       -I$(TOP)/src/mesa/shader \
        -I$(TOP)/src/mesa/swrast \
        -I$(TOP)/src/mesa/swrast_setup
 
+# Core Mesa objects
+MESA_MODULES = $(TOP)/src/mesa/mesa.a
+
+# Libraries that the driver shared lib depends on
+LIB_DEPS = -lm -lpthread -lc
+
+
+ASM_SOURCES = 
+
+OBJECTS = $(C_SOURCES:.c=.o) \
+         $(ASM_SOURCES:.S=.o) 
+
 
 ##### RULES #####
 
 .c.o:
-       $(CC) -c $(SHARED_INCLUDES) $(MINIGLX_INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
+       $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $(DEFINES) $< -o $@
 
 .S.o:
-       $(CC) -c $(SHARED_INCLUDES) $(MINIGLX_INCLUDES) $(CFLAGS) $(DEFINES)  $< -o $@
+       $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $(DEFINES)  $< -o $@
 
 
 ##### TARGETS #####
 
-default: depend fb_dri.so
+default: depend $(LIB_DIR)/$(LIBNAME)
 
-fb_dri.so:  $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile.solo
-       rm -f $@ && gcc -o $@ -shared $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(WINLIB) -lc -lm
-       rm -f $(LIB_DIR)/fb_dri.so && \
-       install fb_dri.so $(LIB_DIR)/fb_dri.so
 
-$(LIB_DIR)/fb_dri.so:  fb_dri.so
-       rm -f $(LIB_DIR)/fb_dri.so && \
-       install fb_dri.so $(LIB_DIR)/fb_dri.so
+$(LIB_DIR)/$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile
+       $(TOP)/bin/mklib -o $(LIBNAME) -noprefix -install $(LIB_DIR) \
+               $(WINLIB) $(LIB_DEPS) $(WINOBJ) $(MESA_MODULES) $(OBJECTS)
+
 
-# Run 'make -f Makefile.solo dep' to update the dependencies if you change
-# what's included by any source file.
 depend: $(C_SOURCES) $(ASM_SOURCES)
        touch depend
-       makedepend -fdepend -Y $(SHARED_INCLUDES) \
-               $(C_SOURCES) $(ASM_SOURCES) >& /dev/null
+       $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDE_DIRS) $(C_SOURCES) $(ASM_SOURCES) \
+               >& /dev/null
 
 
 # Emacs tags
@@ -68,8 +72,8 @@ tags:
        etags `find . -name \*.[ch]` `find ../include`
 
 
-# Remove .o and backup files
 clean:
-       -rm -f *.o *~ *.o *~ *.so
+       -rm -f *.o server/*.o
+
 
 include depend