gallium: Improve winsys dri template Makefile
LIBNAME_EGL had to be removed since if you didn't set it (nobody set it anyways) make would get it confused it with the $(TOP)/lib/gallium target.
This commit is contained in:
parent
5089e5c052
commit
3eebd24cb6
|
@ -79,25 +79,24 @@ SHARED_INCLUDES = \
|
||||||
|
|
||||||
##### TARGETS #####
|
##### TARGETS #####
|
||||||
|
|
||||||
default: depend symlinks $(LIBNAME) $(TOP)/$(LIB_DIR)/gallium/$(LIBNAME) $(LIBNAME_EGL) $(TOP)/$(LIB_DIR)/gallium/$(LIBNAME_EGL)
|
default: depend symlinks $(TOP)/$(LIB_DIR)/gallium/$(LIBNAME)
|
||||||
|
|
||||||
|
|
||||||
$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(PIPE_DRIVERS) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
|
$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(PIPE_DRIVERS) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
|
||||||
$(TOP)/bin/mklib -noprefix -o $@ \
|
$(MKLIB) -noprefix -o $@ \
|
||||||
$(OBJECTS) $(PIPE_DRIVERS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS) $(DRIVER_EXTRAS)
|
$(OBJECTS) $(PIPE_DRIVERS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS) $(DRIVER_EXTRAS)
|
||||||
|
|
||||||
$(LIBNAME_EGL): $(WINSYS_OBJECTS) $(LIBS)
|
$(LIBNAME_EGL): $(WINSYS_OBJECTS) $(LIBS)
|
||||||
$(TOP)/bin/mklib -o $(LIBNAME_EGL) \
|
$(MKLIB) -o $(LIBNAME_EGL) \
|
||||||
-linker "$(CC)" \
|
-linker "$(CC)" \
|
||||||
-noprefix \
|
-noprefix \
|
||||||
$(OBJECTS) $(MKLIB_OPTIONS) $(WINSYS_OBJECTS) $(PIPE_DRIVERS) $(WINOBJ) $(DRI_LIB_DEPS) \
|
$(OBJECTS) $(MKLIB_OPTIONS) $(WINSYS_OBJECTS) $(PIPE_DRIVERS) $(WINOBJ) $(DRI_LIB_DEPS) \
|
||||||
--whole-archive $(LIBS) $(GALLIUM_AUXILIARIES) --no-whole-archive $(DRIVER_EXTRAS)
|
--whole-archive $(LIBS) $(GALLIUM_AUXILIARIES) --no-whole-archive $(DRIVER_EXTRAS)
|
||||||
|
|
||||||
$(TOP)/$(LIB_DIR)/gallium/$(LIBNAME): $(LIBNAME)
|
$(TOP)/$(LIB_DIR)/gallium:
|
||||||
$(INSTALL) $(LIBNAME) $(TOP)/$(LIB_DIR)/gallium
|
mkdir -p $@
|
||||||
|
|
||||||
$(TOP)/$(LIB_DIR)/gallium/$(LIBNAME_EGL): $(LIBNAME_EGL)
|
$(TOP)/$(LIB_DIR)/gallium/$(LIBNAME): $(LIBNAME) $(TOP)/$(LIB_DIR)/gallium
|
||||||
$(INSTALL) $(LIBNAME_EGL) $(TOP)/$(LIB_DIR)/gallium
|
$(INSTALL) $(LIBNAME) $(TOP)/$(LIB_DIR)/gallium
|
||||||
|
|
||||||
depend: $(C_SOURCES) $(ASM_SOURCES) $(SYMLINKS)
|
depend: $(C_SOURCES) $(ASM_SOURCES) $(SYMLINKS)
|
||||||
rm -f depend
|
rm -f depend
|
||||||
|
|
Loading…
Reference in New Issue