From 6423ec914530a84ee16977d95b64116e63eca22c Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Mon, 21 Aug 2006 16:05:30 +0000 Subject: move ALL_SOURCES to sources file --- src/mesa/Makefile | 13 ++----------- src/mesa/sources | 10 +++++++++- 2 files changed, 11 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/mesa/Makefile b/src/mesa/Makefile index 5bfd728f202..d4645606f7f 100644 --- a/src/mesa/Makefile +++ b/src/mesa/Makefile @@ -84,6 +84,7 @@ fbdev: $(CORE_OBJECTS) $(FBDEV_DRIVER_OBJECTS) $(COMMON_DRIVER_OBJECTS) $(CORE_OBJECTS) $(FBDEV_DRIVER_OBJECTS) \ $(COMMON_DRIVER_OBJECTS) $(GL_LIB_DEPS) + ###################################################################### # Stand-alone Mesa libGL and libOSMesa STAND_ALONE_DRIVER_SOURCES = \ @@ -137,16 +138,6 @@ $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_DRIVER_OBJECTS) $(OSMESA16_OBJECT ###################################################################### # Generic stuff -ALL_SOURCES = \ - $(GLAPI_SOURCES) \ - $(SOLO_SOURCES) \ - $(X86_SOURCES) \ - $(COMMON_DRIVER_SOURCES)\ - $(X11_DRIVER_SOURCES) \ - $(FBDEV_DRIVER_SOURCES) \ - $(OSMESA_DRIVER_SOURCES) - - depend: $(ALL_SOURCES) @ echo "running $(MKDEP)" @ touch depend @@ -168,7 +159,6 @@ install: default cd drivers/dri ; $(MAKE) install ; \ fi - ## NOT YET: ## $(INSTALL) -d $(INSTALL_DIR)/include/GLES ## $(INSTALL) -m 644 include/GLES/*.h $(INSTALL_DIR)/include/GLES @@ -187,4 +177,5 @@ clean: (cd x86 ; $(MAKE) clean) (cd x86-64 ; $(MAKE) clean) + include depend diff --git a/src/mesa/sources b/src/mesa/sources index 4eb5ae748fa..c02ba503401 100644 --- a/src/mesa/sources +++ b/src/mesa/sources @@ -303,6 +303,15 @@ FBDEV_DRIVER_SOURCES = \ ### All the core C sources +ALL_SOURCES = \ + $(GLAPI_SOURCES) \ + $(SOLO_SOURCES) \ + $(X86_SOURCES) \ + $(COMMON_DRIVER_SOURCES)\ + $(X11_DRIVER_SOURCES) \ + $(FBDEV_DRIVER_SOURCES) \ + $(OSMESA_DRIVER_SOURCES) + SOLO_SOURCES = \ $(MAIN_SOURCES) \ $(MATH_SOURCES) \ @@ -313,7 +322,6 @@ SOLO_SOURCES = \ $(SWRAST_SETUP_SOURCES) \ $(ASM_C_SOURCES) \ $(SLANG_SOURCES) - # $(SLANG_C_SOURCES) CORE_SOURCES = \ -- cgit v1.2.3