diff options
| author | Chia-I Wu <olvaffe@gmail.com> | 2009-11-10 13:10:55 +0800 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-11-10 11:24:10 -0700 |
| commit | 5f0ea53747c14b1cd9686bcf650b96504128116e (patch) | |
| tree | c5a7b6d5da8cb56e3d7abb45f6668e9d1b24ad78 | |
| parent | 0b9f0ba7065c9cdbeaeac477c801dead001ab215 (diff) | |
egl_softpipe: Clean up Makefile.
Fix generation of depend. Link to the dynamic libraries used.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
| -rw-r--r-- | src/gallium/winsys/egl_xlib/Makefile | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/gallium/winsys/egl_xlib/Makefile b/src/gallium/winsys/egl_xlib/Makefile index 3efb7ed4af..06c1fb0b91 100644 --- a/src/gallium/winsys/egl_xlib/Makefile +++ b/src/gallium/winsys/egl_xlib/Makefile @@ -29,13 +29,7 @@ WINSYS_OBJECTS = $(WINSYS_SOURCES:.c=.o) LIBS = \ $(GALLIUM_DRIVERS) \ $(GALLIUM_AUXILIARIES) - -# XXX temporary (should create a separate lib with the GL API funcs and -# mesa code, as done for ES 1.x, 2.x, OpenVG, etc) -UNUSED_LIBS = \ - $(TOP)/src/mesa/libglapi.a \ - $(TOP)/src/mesa/libmesagallium.a \ - +LIB_DEPS = $(EGL_LIB_DEPS) -lm -lX11 LOCAL_CFLAGS = @@ -60,14 +54,15 @@ $(TOP)/$(LIB_DIR)/$(DRIVER_NAME): $(WINSYS_OBJECTS) $(LIBS) -noprefix \ -install $(TOP)/$(LIB_DIR) \ $(MKLIB_OPTIONS) $(WINSYS_OBJECTS) \ - -Wl,--whole-archive $(LIBS) -Wl,--no-whole-archive + -Wl,--whole-archive $(LIBS) -Wl,--no-whole-archive \ + $(LIB_DEPS) -depend: $(ALL_SOURCES) +depend: $(WINSYS_SOURCES) @ echo "running $(MKDEP)" @ rm -f depend # workaround oops on gutsy?!? @ touch depend - @ $(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDE_DIRS) $(ALL_SOURCES) \ + @ $(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDE_DIRS) $(WINSYS_SOURCES) \ > /dev/null 2>/dev/null |