From 883f9891cb203dd087843b830ab058d6c9e160dc Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 13 Jul 2006 02:50:27 +0000 Subject: LIB_DIR is now just 'lib' or 'lib64' Replaced $(LIB_DIR) with $(TOP)/$(LIB_DIR), use LIB_DIR in install targets. Patch by Hanno Böck. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Makefile | 6 +++--- src/egl/drivers/demo/Makefile | 6 +++--- src/egl/drivers/dri/Makefile | 6 +++--- src/egl/main/Makefile | 6 +++--- src/glu/Makefile | 4 ++-- src/glu/mesa/Makefile | 10 +++++----- src/glu/sgi/Makefile | 10 +++++----- src/glut/beos/Makefile | 10 +++++----- src/glut/directfb/Makefile | 6 +++--- src/glut/ggi/Makefile | 6 +++--- src/glut/glx/Makefile | 10 +++++----- src/glut/mini/Makefile | 6 +++--- src/glw/Makefile | 10 +++++----- src/glx/mini/Makefile | 12 ++++++------ src/glx/x11/Makefile | 10 +++++----- src/mesa/Makefile | 20 ++++++++++---------- src/mesa/drivers/beos/Makefile | 10 +++++----- src/mesa/drivers/directfb/Makefile | 2 +- src/mesa/drivers/dri/Makefile | 6 +++--- src/mesa/drivers/dri/Makefile.template | 10 +++++----- src/mesa/drivers/dri/glcore/Makefile | 6 +++--- 21 files changed, 86 insertions(+), 86 deletions(-) (limited to 'src') diff --git a/src/Makefile b/src/Makefile index c6082e8519..f52a06a3c9 100644 --- a/src/Makefile +++ b/src/Makefile @@ -7,7 +7,7 @@ include $(TOP)/configs/current SUBDIRS = $(SRC_DIRS) -default: message $(LIB_DIR) subdirs +default: message $(TOP)/$(LIB_DIR) subdirs message: @@ -28,8 +28,8 @@ install: fi \ done -$(LIB_DIR): - -mkdir $(LIB_DIR) +$(TOP)/$(LIB_DIR): + -mkdir $(TOP)/$(LIB_DIR) clean: diff --git a/src/egl/drivers/demo/Makefile b/src/egl/drivers/demo/Makefile index fd587b79e2..5c05633df5 100644 --- a/src/egl/drivers/demo/Makefile +++ b/src/egl/drivers/demo/Makefile @@ -17,12 +17,12 @@ OBJECTS = $(SOURCES:.c=.o) -default: $(LIB_DIR)/demodriver.so +default: $(TOP)/$(LIB_DIR)/demodriver.so -$(LIB_DIR)/demodriver.so: $(OBJECTS) +$(TOP)/$(LIB_DIR)/demodriver.so: $(OBJECTS) $(TOP)/bin/mklib -o demodriver.so -noprefix \ - -install $(LIB_DIR) $(OBJECTS) + -install $(TOP)/$(LIB_DIR) $(OBJECTS) diff --git a/src/egl/drivers/dri/Makefile b/src/egl/drivers/dri/Makefile index 86f189cd38..cb11971c64 100644 --- a/src/egl/drivers/dri/Makefile +++ b/src/egl/drivers/dri/Makefile @@ -39,11 +39,11 @@ default: depend library Makefile # EGLdri Library -library: $(LIB_DIR)/libEGLdri.so +library: $(TOP)/$(LIB_DIR)/libEGLdri.so -$(LIB_DIR)/libEGLdri.so: $(OBJECTS) +$(TOP)/$(LIB_DIR)/libEGLdri.so: $(OBJECTS) $(TOP)/bin/mklib -o EGLdri -major 1 -minor 0 \ - -install $(LIB_DIR) -ldl $(OBJECTS) + -install $(TOP)/$(LIB_DIR) -ldl $(OBJECTS) clean: diff --git a/src/egl/main/Makefile b/src/egl/main/Makefile index 45a4fb39b8..431eda4197 100644 --- a/src/egl/main/Makefile +++ b/src/egl/main/Makefile @@ -43,11 +43,11 @@ default: depend library # EGL Library -library: $(LIB_DIR)/libEGL.so +library: $(TOP)/$(LIB_DIR)/libEGL.so -$(LIB_DIR)/libEGL.so: $(OBJECTS) +$(TOP)/$(LIB_DIR)/libEGL.so: $(OBJECTS) $(TOP)/bin/mklib -o EGL -major 1 -minor 0 \ - -install $(LIB_DIR) -ldl $(OBJECTS) + -install $(TOP)/$(LIB_DIR) -ldl $(OBJECTS) diff --git a/src/glu/Makefile b/src/glu/Makefile index a7b8e2b724..ca9ad39442 100644 --- a/src/glu/Makefile +++ b/src/glu/Makefile @@ -14,8 +14,8 @@ default: $(TOP)/configs/current done install: - $(INSTALL) -d $(INSTALL_DIR)/lib - $(COPY_LIBS) $(LIB_DIR)/libGLU.* $(INSTALL_DIR)/lib + $(INSTALL) -d $(INSTALL_DIR)/$(LIB_DIR) + $(COPY_LIBS) $(TOP)/$(LIB_DIR)/libGLU.* $(INSTALL_DIR)/$(LIB_DIR) clean: @for dir in $(SUBDIRS) ; do \ diff --git a/src/glu/mesa/Makefile b/src/glu/mesa/Makefile index 69a4ea88cf..47f95ef024 100644 --- a/src/glu/mesa/Makefile +++ b/src/glu/mesa/Makefile @@ -37,17 +37,17 @@ default: echo "$(GLU_LIB_NAME) not build under BeOS, but integrated into ${GL_LIB_NAME}." ; \ exit 0 ; \ else \ - $(MAKE) "${LIB_DIR}/${GLU_LIB_NAME}" ; \ + $(MAKE) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) ; \ fi -$(LIB_DIR): - -mkdir $(LIB_DIR) +$(TOP)/$(LIB_DIR): + -mkdir $(TOP)/$(LIB_DIR) # Make the library: -$(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS) +$(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS) @ $(TOP)/bin/mklib -o $(GLU_LIB) -linker '$(CC)' \ -major $(GLU_MAJOR) -minor $(GLU_MINOR) -patch $(GLU_TINY) \ - $(MKLIB_OPTIONS) -install $(LIB_DIR) \ + $(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \ $(GLU_LIB_DEPS) $(OBJECTS) clean: diff --git a/src/glu/sgi/Makefile b/src/glu/sgi/Makefile index 46dafe999e..2ce6ac0430 100644 --- a/src/glu/sgi/Makefile +++ b/src/glu/sgi/Makefile @@ -128,17 +128,17 @@ default: echo "$(GLU_LIB_NAME) not build under BeOS, but integrated into ${GL_LIB_NAME}." ; \ exit 0 ; \ else \ - $(MAKE) "${LIB_DIR}/${GLU_LIB_NAME}" ; \ + $(MAKE) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) ; \ fi -$(LIB_DIR): - -mkdir $(LIB_DIR) +$(TOP)/$(LIB_DIR): + -mkdir $(TOP)/$(LIB_DIR) # Make the library: -$(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS) +$(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS) $(TOP)/bin/mklib -o $(GLU_LIB) -linker '$(CXX)' \ -major $(GLU_MAJOR) -minor $(GLU_MINOR) -patch $(GLU_TINY) \ - -cplusplus $(MKLIB_OPTIONS) -install $(LIB_DIR) \ + -cplusplus $(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \ $(GLU_LIB_DEPS) $(OBJECTS) diff --git a/src/glut/beos/Makefile b/src/glut/beos/Makefile index d9cf32565c..3ff928bfd7 100644 --- a/src/glut/beos/Makefile +++ b/src/glut/beos/Makefile @@ -75,16 +75,16 @@ INCLUDES = \ # ---- TARGETS -default: $(LIB_DIR) $(LIB_DIR)/$(GLUT_LIB_NAME) +default: $(TOP)/$(LIB_DIR) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) # Create the lib directory if missing -$(LIB_DIR): - mkdir $(LIB_DIR) +$(TOP)/$(LIB_DIR): + mkdir $(TOP)/$(LIB_DIR) # Make the library -$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS) +$(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS) @$(TOP)/bin/mklib -o $(GLUT_LIB) -major $(GLUT_MAJOR) -minor $(GLUT_MINOR) -patch $(GLUT_TINY) \ - -install $(LIB_DIR) $(MKLIB_OPTIONS) $(GLUT_LIB_DEPS) \ + -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) $(GLUT_LIB_DEPS) \ $(OBJECTS) clean: diff --git a/src/glut/directfb/Makefile b/src/glut/directfb/Makefile index 9e3caaa5c2..3791b16df8 100644 --- a/src/glut/directfb/Makefile +++ b/src/glut/directfb/Makefile @@ -56,14 +56,14 @@ OBJECTS = $(SOURCES:.c=.o) ##### TARGETS ##### -default: depend $(LIB_DIR)/$(GLUT_LIB_NAME) +default: depend $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) # Make the library -$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS) +$(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS) $(TOP)/bin/mklib -o $(GLUT_LIB) -linker '$(CC)' \ -major $(GLUT_MAJOR) -minor $(GLUT_MINOR) -patch $(GLUT_TINY) \ - $(GLUT_LIB_DEPS) -install $(LIB_DIR) \ + $(GLUT_LIB_DEPS) -install $(TOP)/$(LIB_DIR) \ $(MKLIB_OPTIONS) $(OBJECTS) diff --git a/src/glut/ggi/Makefile b/src/glut/ggi/Makefile index 61cfceeb25..1bef6c23a3 100644 --- a/src/glut/ggi/Makefile +++ b/src/glut/ggi/Makefile @@ -27,14 +27,14 @@ OBJECTS = $(SOURCES:.c=.o) ##### TARGETS ##### -default: $(LIB_DIR)/$(GLUT_LIB_NAME) +default: $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) # Make the library -$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS) +$(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS) $(TOP)/bin/mklib -o $(GLUT_LIB) -linker '$(CC)' \ -major $(GLUT_MAJOR) -minor $(GLUT_MINOR) \ - -patch $(GLUT_TINY) $(MKLIB_OPTIONS) -install $(LIB_DIR) \ + -patch $(GLUT_TINY) $(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \ $(GLUT_LIB_DEPS) $(OBJECTS) diff --git a/src/glut/glx/Makefile b/src/glut/glx/Makefile index 534d7a7ad5..6fac92fa0c 100644 --- a/src/glut/glx/Makefile +++ b/src/glut/glx/Makefile @@ -85,22 +85,22 @@ OBJECTS = $(SOURCES:.c=.o) ##### TARGETS ##### -default: $(LIB_DIR)/$(GLUT_LIB_NAME) +default: $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) # Make the library -$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS) +$(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS) $(TOP)/bin/mklib -o $(GLUT_LIB) -linker '$(CC)' \ -major $(GLUT_MAJOR) -minor $(GLUT_MINOR) -patch $(GLUT_TINY) \ - $(MKLIB_OPTIONS) -install $(LIB_DIR) \ + $(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \ $(GLUT_LIB_DEPS) $(OBJECTS) install: $(INSTALL) -d $(INSTALL_DIR)/include/GL - $(INSTALL) -d $(INSTALL_DIR)/lib + $(INSTALL) -d $(INSTALL_DIR)/$(LIB_DIR) $(INSTALL) -m 644 $(TOP)/include/GL/glut.h $(INSTALL_DIR)/include/GL - $(COPY_LIBS) $(LIB_DIR)/libglut* $(INSTALL_DIR)/lib + $(COPY_LIBS) $(TOP)/$(LIB_DIR)/libglut* $(INSTALL_DIR)/$(LIB_DIR) clean: diff --git a/src/glut/mini/Makefile b/src/glut/mini/Makefile index cb82384941..177bfe2d2b 100644 --- a/src/glut/mini/Makefile +++ b/src/glut/mini/Makefile @@ -50,14 +50,14 @@ OBJECTS = $(SOURCES:.c=.o) ##### TARGETS ##### -default: depend $(LIB_DIR)/$(GLUT_LIB_NAME) +default: depend $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) # Make the library -$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS) +$(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS) $(TOP)/bin/mklib -o $(GLUT_LIB) -linker '$(CC)' \ -major $(GLUT_MAJOR) -minor $(GLUT_MINOR) -patch $(GLUT_TINY) \ - $(GLUT_LIB_DEPS) -install $(LIB_DIR) \ + $(GLUT_LIB_DEPS) -install $(TOP)/$(LIB_DIR) \ $(MKLIB_OPTIONS) $(OBJECTS) diff --git a/src/glw/Makefile b/src/glw/Makefile index dbe64c9566..356351a1ce 100644 --- a/src/glw/Makefile +++ b/src/glw/Makefile @@ -23,13 +23,13 @@ OBJECTS = $(GLW_SOURCES:.c=.o) ##### TARGETS ##### -default: $(LIB_DIR)/$(GLW_LIB_NAME) +default: $(TOP)/$(LIB_DIR)/$(GLW_LIB_NAME) install: $(INSTALL) -d $(INSTALL_DIR)/include/GL - $(INSTALL) -d $(INSTALL_DIR)/lib + $(INSTALL) -d $(INSTALL_DIR)/$(LIB_DIR) $(INSTALL) -m 644 *.h $(INSTALL_DIR)/include/GL - $(COPY_LIBS) $(LIB_DIR)/libGLw.* $(INSTALL_DIR)/lib + $(COPY_LIBS) $(TOP)/$(LIB_DIR)/libGLw.* $(INSTALL_DIR)/$(LIB_DIR) clean: -rm depend depend.bak @@ -37,10 +37,10 @@ clean: # Make the library -$(LIB_DIR)/$(GLW_LIB_NAME): $(OBJECTS) +$(TOP)/$(LIB_DIR)/$(GLW_LIB_NAME): $(OBJECTS) $(TOP)/bin/mklib -o $(GLW_LIB) -linker '$(CC)' \ -major $(MAJOR) -minor $(MINOR) -patch $(TINY) \ - $(MKLIB_OPTIONS) -install $(LIB_DIR) \ + $(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \ $(GLW_LIB_DEPS) $(OBJECTS) diff --git a/src/glx/mini/Makefile b/src/glx/mini/Makefile index 9503192274..217b8a76ec 100644 --- a/src/glx/mini/Makefile +++ b/src/glx/mini/Makefile @@ -46,16 +46,16 @@ INCLUDE_DIRS = \ ##### TARGETS ##### -default: depend $(LIB_DIR)/$(GL_LIB_NAME) +default: depend $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) # Make libGL -$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) Makefile +$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) Makefile $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' \ -major 1 -minor 2 $(MKLIB_OPTIONS) \ - -install $(LIB_DIR) $(GL_LIB_DEPS) $(OBJECTS) `/usr/bin/pkg-config --libs libdrm` `/usr/bin/pkg-config --libs pciaccess` - rm -f $(LIB_DIR)/miniglx.conf - install example.miniglx.conf $(LIB_DIR)/miniglx.conf + -install $(TOP)/$(LIB_DIR) $(GL_LIB_DEPS) $(OBJECTS) `/usr/bin/pkg-config --libs libdrm` `/usr/bin/pkg-config --libs pciaccess` + rm -f $(TOP)/$(LIB_DIR)/miniglx.conf + install example.miniglx.conf $(TOP)/$(LIB_DIR)/miniglx.conf drmtest: xf86drm.o drmtest.o @@ -75,7 +75,7 @@ tags: # Remove .o and backup files clean: - -rm -f drmtest $(LIB_DIR)/libGL.so* + -rm -f drmtest $(TOP)/$(LIB_DIR)/libGL.so* -rm -f *.o *~ -rm -f depend diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile index b33a84e94b..3ecb744179 100644 --- a/src/glx/x11/Makefile +++ b/src/glx/x11/Makefile @@ -2,7 +2,7 @@ TOP = ../../.. include $(TOP)/configs/current EXTRA_DEFINES = -DXF86VIDMODE -D_REENTRANT -UIN_DRI_DRIVER \ - -DDEFAULT_DRIVER_DIR=\"$(DRI_DRIVER_INSTALL_DIR)\" + -DDEFAULT_DRIVER_DIR=\"$(DRI_DRIVER_SEARCH_DIR)\" SOURCES = \ glcontextmodes.c \ @@ -61,16 +61,16 @@ INCLUDES = -I. \ ##### TARGETS ##### -default: depend $(LIB_DIR)/$(GL_LIB_NAME) +default: depend $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) glcontextmodes.c: ln -s $(TOP)/src/mesa/drivers/dri/common/glcontextmodes.c . # Make libGL -$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) Makefile +$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) Makefile $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' \ -major 1 -minor 2 $(MKLIB_OPTIONS) \ - -install $(LIB_DIR) $(GL_LIB_DEPS) $(OBJECTS) + -install $(TOP)/$(LIB_DIR) $(GL_LIB_DEPS) $(OBJECTS) depend: $(SOURCES) $(MESA_GLAPI_SOURCES) $(MESA_ASM_API) Makefile @@ -88,7 +88,7 @@ install: # Remove .o and backup files clean: - -rm -f $(LIB_DIR)/libGL.so* + -rm -f $(TOP)/$(LIB_DIR)/libGL.so* -rm -f *.o *~ -rm -f depend diff --git a/src/mesa/Makefile b/src/mesa/Makefile index 652cb44907..bf600e0578 100644 --- a/src/mesa/Makefile +++ b/src/mesa/Makefile @@ -66,7 +66,7 @@ linux-solo: depend subdirs libmesa.a libgl-core: $(CORE_OBJECTS) @ $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' \ -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \ - -install $(LIB_DIR) $(MKLIB_OPTIONS) $(CORE_OBJECTS) $(GL_LIB_DEPS) + -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) $(CORE_OBJECTS) $(GL_LIB_DEPS) directfb: depend subdirs libgl-core cd drivers/directfb; $(MAKE) @@ -96,30 +96,30 @@ OSMESA16_OBJECTS = \ $(OSMESA_DRIVER_OBJECTS) -stand-alone: depend subdirs $(LIB_DIR)/$(GL_LIB_NAME) $(LIB_DIR)/$(OSMESA_LIB_NAME) +stand-alone: depend subdirs $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME) -osmesa-only: depend subdirs $(LIB_DIR)/$(OSMESA_LIB_NAME) +osmesa-only: depend subdirs $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME) # Make the GL library -$(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS) +$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS) @ $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' \ -major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \ - -install $(LIB_DIR) \ + -install $(TOP)/$(LIB_DIR) \ $(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(STAND_ALONE_OBJECTS) # Make the OSMesa library -$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_DRIVER_OBJECTS) $(OSMESA16_OBJECTS) +$(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_DRIVER_OBJECTS) $(OSMESA16_OBJECTS) @ if [ "${DRIVER_DIRS}" = "osmesa" ] ; then \ $(TOP)/bin/mklib -o $(OSMESA_LIB) -linker '$(CC)' \ -major $(MESA_MAJOR) \ -minor $(MESA_MINOR) -patch $(MESA_TINY) \ - -install $(LIB_DIR) $(MKLIB_OPTIONS) \ + -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \ $(OSMESA_LIB_DEPS) $(OSMESA16_OBJECTS) ; \ else \ $(TOP)/bin/mklib -o $(OSMESA_LIB) -linker '$(CC)' \ -major $(MESA_MAJOR) \ -minor $(MESA_MINOR) -patch $(GL_TINY) \ - -install $(LIB_DIR) $(MKLIB_OPTIONS) \ + -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \ $(OSMESA_LIB_DEPS) $(OSMESA_DRIVER_OBJECTS) ; \ fi @@ -150,9 +150,9 @@ subdirs: install: default $(INSTALL) -d $(INSTALL_DIR)/include/GL - $(INSTALL) -d $(INSTALL_DIR)/lib + $(INSTALL) -d $(INSTALL_DIR)/$(LIB_DIR) $(INSTALL) -m 644 $(TOP)/include/GL/*.h $(INSTALL_DIR)/include/GL - $(COPY_LIBS) $(LIB_DIR)/libGL.* $(INSTALL_DIR)/lib + $(COPY_LIBS) $(TOP)/$(LIB_DIR)/libGL.* $(INSTALL_DIR)/$(LIB_DIR) @if [ "${DRIVER_DIRS}" = "dri" ] ; then \ cd drivers/dri ; $(MAKE) install ; \ fi diff --git a/src/mesa/drivers/beos/Makefile b/src/mesa/drivers/beos/Makefile index 41aa3a65c1..1897d6aa3e 100644 --- a/src/mesa/drivers/beos/Makefile +++ b/src/mesa/drivers/beos/Makefile @@ -167,7 +167,7 @@ OBJECTS := $(DRIVER_OBJECTS:.cpp=.o) $(CC) $(INCLUDES) $(CFLAGS) -c $< -o $@ -default: depend $(LIB_DIR) $(LIB_DIR)/$(GL_LIB_NAME) +default: depend $(TOP)/$(LIB_DIR) $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(MESA_MODULES): cd $(TOP)/src/mesa; $(MAKE) mesa.a ; @@ -175,11 +175,11 @@ $(MESA_MODULES): $(GLU_MODULES): cd $(GLU_DIR); $(MAKE) $(subst $(GLU_DIR)/,,$(GLU_MODULES)) ; -$(LIB_DIR): - mkdir $(LIB_DIR) +$(TOP)/$(LIB_DIR): + mkdir $(TOP)/$(LIB_DIR) -$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) $(MESA_MODULES) $(GLU_MODULES) - @$(TOP)/bin/mklib -o $(GL_LIB) -install $(LIB_DIR) -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \ +$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) $(MESA_MODULES) $(GLU_MODULES) + @$(TOP)/bin/mklib -o $(GL_LIB) -install $(TOP)/$(LIB_DIR) -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \ $(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(OBJECTS) $(MESA_MODULES) $(GLU_MODULES) # $(GLU_OBJECTS): diff --git a/src/mesa/drivers/directfb/Makefile b/src/mesa/drivers/directfb/Makefile index 2184b1e3cc..c515785b2a 100644 --- a/src/mesa/drivers/directfb/Makefile +++ b/src/mesa/drivers/directfb/Makefile @@ -34,7 +34,7 @@ default: directfbgl_mesa # Mesa DirectFBGL module directfbgl_mesa: $(DIRECTFBGL_MESA_OBJECTS) $(CC) -shared $(CFLAGS) $(DIRECTFBGL_MESA_OBJECTS) -o $(DIRECTFBGL_MESA) \ - -Wl,-soname -Wl,$(DIRECTFBGL_MESA) -L$(LIB_DIR) -lGL -lm + -Wl,-soname -Wl,$(DIRECTFBGL_MESA) -L$(TOP)/$(LIB_DIR) -lGL -lm install: diff --git a/src/mesa/drivers/dri/Makefile b/src/mesa/drivers/dri/Makefile index a49de0f0fa..1db878bab7 100644 --- a/src/mesa/drivers/dri/Makefile +++ b/src/mesa/drivers/dri/Makefile @@ -6,11 +6,11 @@ include $(TOP)/configs/current -default: $(LIB_DIR) subdirs +default: $(TOP)/$(LIB_DIR) subdirs -$(LIB_DIR): - -mkdir $(LIB_DIR) +$(TOP)/$(LIB_DIR): + -mkdir $(TOP)/$(LIB_DIR) subdirs: diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template index e802dd545e..58912730fd 100644 --- a/src/mesa/drivers/dri/Makefile.template +++ b/src/mesa/drivers/dri/Makefile.template @@ -62,12 +62,12 @@ SHARED_INCLUDES = \ ##### TARGETS ##### -default: depend symlinks $(LIBNAME) $(LIB_DIR)/$(LIBNAME) +default: depend symlinks $(LIBNAME) $(TOP)/$(LIB_DIR)/$(LIBNAME) -#$(LIB_DIR)/$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile +#$(TOP)/$(LIB_DIR)/$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile # @echo BUILDING FOR: $(WINDOW_SYSTEM) -# $(TOP)/bin/mklib -o $(LIBNAME) -noprefix -install $(LIB_DIR) \ +# $(TOP)/bin/mklib -o $(LIBNAME) -noprefix -install $(TOP)/$(LIB_DIR) \ # $(WINLIB) $(LIB_DEPS) $(WINOBJ) $(MESA_MODULES) $(OBJECTS) $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template @@ -75,8 +75,8 @@ $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/driver $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS) -$(LIB_DIR)/$(LIBNAME): $(LIBNAME) - $(INSTALL) $(LIBNAME) $(LIB_DIR) +$(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME) + $(INSTALL) $(LIBNAME) $(TOP)/$(LIB_DIR) diff --git a/src/mesa/drivers/dri/glcore/Makefile b/src/mesa/drivers/dri/glcore/Makefile index 744b528c35..a9e96970fa 100644 --- a/src/mesa/drivers/dri/glcore/Makefile +++ b/src/mesa/drivers/dri/glcore/Makefile @@ -57,11 +57,11 @@ OBJECTS = $(C_SOURCES:.c=.o) \ ##### TARGETS ##### -default: depend $(LIB_DIR)/$(LIBNAME) +default: depend $(TOP)/$(LIB_DIR)/$(LIBNAME) -$(LIB_DIR)/$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile - CC="$(CC)" CXX="$(CXX)" $(TOP)/bin/mklib -o $(LIBNAME) -noprefix -install $(LIB_DIR) \ +$(TOP)/$(LIB_DIR)/$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile + CC="$(CC)" CXX="$(CXX)" $(TOP)/bin/mklib -o $(LIBNAME) -noprefix -install $(TOP)/$(LIB_DIR) \ $(OBJECTS) $(WINLIB) $(LIB_DEPS) $(WINOBJ) $(MESA_MODULES) -- cgit v1.2.3