diff options
Diffstat (limited to 'src/glx')
| -rw-r--r-- | src/glx/mini/Makefile | 12 | ||||
| -rw-r--r-- | src/glx/x11/Makefile | 10 |
2 files changed, 11 insertions, 11 deletions
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 |