diff options
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/Makefile | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/beos/Makefile | 14 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/Makefile.template | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/dri_client/Makefile | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r200/Makefile | 9 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/x11/Makefile | 2 |
6 files changed, 18 insertions, 19 deletions
diff --git a/src/mesa/Makefile b/src/mesa/Makefile index d77af533e1c..4672ace65e5 100644 --- a/src/mesa/Makefile +++ b/src/mesa/Makefile @@ -172,8 +172,8 @@ SUBDIRS = array_cache drivers/dri glapi main math sparc swrast swrast_setup \ depend: $(ALL_SOURCES) @ echo "running $(MKDEP)" @ touch depend - @ $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDE_DIRS) $(ALL_SOURCES) \ - > /dev/null 2>&1 + $(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDE_DIRS) $(ALL_SOURCES) \ + > /dev/null # Emacs tags diff --git a/src/mesa/drivers/beos/Makefile b/src/mesa/drivers/beos/Makefile index 3b1038b0d47..41aa3a65c16 100644 --- a/src/mesa/drivers/beos/Makefile +++ b/src/mesa/drivers/beos/Makefile @@ -11,7 +11,7 @@ MESA_MODULES = $(TOP)/src/mesa/mesa.a # GLU_DIR = $(TOP)/src/glu/mesa ifeq ($(GLU_DIR),) - # By default, we build the SGI GLU implementation +# By default, we build the SGI GLU implementation GLU_DIR = $(TOP)/src/glu/sgi endif @@ -146,9 +146,9 @@ DRIVER_SOURCES = \ ifeq ($(CPU), x86) DRIVER_SOURCES += $(addprefix ../../, $(X86_API)) else - # No GL API PPC optimization yet +# No GL API PPC optimization yet endif - + DRIVER_OBJECTS = $(DRIVER_SOURCES:.c=.o) DRIVER_OBJECTS := $(DRIVER_OBJECTS:.S=.o) @@ -171,10 +171,10 @@ default: depend $(LIB_DIR) $(LIB_DIR)/$(GL_LIB_NAME) $(MESA_MODULES): cd $(TOP)/src/mesa; $(MAKE) mesa.a ; - + $(GLU_MODULES): cd $(GLU_DIR); $(MAKE) $(subst $(GLU_DIR)/,,$(GLU_MODULES)) ; - + $(LIB_DIR): mkdir $(LIB_DIR) @@ -187,9 +187,9 @@ $(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) $(MESA_MODULES) $(GLU_MODULES) depend: $(DRIVER_SOURCES) $(GLU_SOURCES) touch depend - $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(DRIVER_SOURCES) $(GLU_SOURCES) > /dev/null 2>&1 + $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(DRIVER_SOURCES) $(GLU_SOURCES) > /dev/null clean: rm -f depend $(OBJECTS) - + include depend diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template index 3e8ac6693e7..a9c8241df0f 100644 --- a/src/mesa/drivers/dri/Makefile.template +++ b/src/mesa/drivers/dri/Makefile.template @@ -84,8 +84,8 @@ $(LIB_DIR)/$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src # what's included by any source file. depend: $(C_SOURCES) $(ASM_SOURCES) touch depend - $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(C_SOURCES) $(ASM_SOURCES) \ - > /dev/null 2>&1 + $(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDES) $(C_SOURCES) $(ASM_SOURCES) \ + > /dev/null # Emacs tags diff --git a/src/mesa/drivers/dri/dri_client/Makefile b/src/mesa/drivers/dri/dri_client/Makefile index 35a7ed4cd0b..9ec09e9a023 100644 --- a/src/mesa/drivers/dri/dri_client/Makefile +++ b/src/mesa/drivers/dri/dri_client/Makefile @@ -42,8 +42,8 @@ default: depend dri.a # what's included by any source file. depend: $(C_SOURCES) $(ASM_SOURCES) touch depend - $(MKDEP) $(MKDEP_OPTIONS) -Y $(INCLUDES) \ - $(C_SOURCES) $(ASM_SOURCES) > /dev/null 2>&1 + $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) \ + $(C_SOURCES) $(ASM_SOURCES) dri.a: $(OBJECTS) diff --git a/src/mesa/drivers/dri/r200/Makefile b/src/mesa/drivers/dri/r200/Makefile index a2aeeb5a945..e3045287fd4 100644 --- a/src/mesa/drivers/dri/r200/Makefile +++ b/src/mesa/drivers/dri/r200/Makefile @@ -43,17 +43,16 @@ C_SOURCES = $(COMMON_SOURCES) $(DRIVER_SOURCES) X86_SOURCES = r200_vtxtmp_x86.S SYMLINKS = \ - server/radeon_dri.c \ - server/radeon_dri.h \ - server/radeon.h \ - server/radeon_macros.h \ - server/radeon_reg.h + server/radeon_dri.c + ##### TARGETS ##### include ../Makefile.template +INCLUDES += -I../radeon/server + $(SYMLINKS): mkdir -p server for i in $(SYMLINKS) ; do rm -f $$i && test -f ../radeon/$$i && ln -s ../../radeon/$$i $$i ; done diff --git a/src/mesa/drivers/dri/x11/Makefile b/src/mesa/drivers/dri/x11/Makefile index 4fe42a2fbff..3b0b2e2848d 100644 --- a/src/mesa/drivers/dri/x11/Makefile +++ b/src/mesa/drivers/dri/x11/Makefile @@ -74,7 +74,7 @@ $(LIB_DIR)/$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile depend: $(C_SOURCES) $(ASM_SOURCES) touch depend $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDE_DIRS) $(C_SOURCES) $(ASM_SOURCES) \ - > /dev/null 2>&1 + > /dev/null # Emacs tags |