diff options
| author | Dave Airlie <[email protected]> | 2009-03-20 10:52:17 +1000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2009-03-20 10:52:17 +1000 |
| commit | 407e8ae5b167b0193e1e5b1266a5d61ed836dfb5 (patch) | |
| tree | 2d9d05a5c3122f41a13aa8bd9ae921c1176e6b0d /src/egl/main/Makefile | |
| parent | bdaa0341caffc353fd26bbd91865c2d86eed11c1 (diff) | |
| parent | 114bb54324f22cb53bcd14607234d0acd74d37bd (diff) | |
Merge remote branch 'main/master' into radeon-rewrite
Conflicts:
src/mesa/drivers/dri/r300/r300_cmdbuf.c
src/mesa/drivers/dri/r300/r300_state.c
src/mesa/drivers/dri/r300/r300_swtcl.c
src/mesa/drivers/dri/r300/radeon_ioctl.c
src/mesa/drivers/dri/radeon/radeon_screen.c
Diffstat (limited to 'src/egl/main/Makefile')
| -rw-r--r-- | src/egl/main/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/egl/main/Makefile b/src/egl/main/Makefile index 89b4a200bcd..5ee246dc3f5 100644 --- a/src/egl/main/Makefile +++ b/src/egl/main/Makefile @@ -46,8 +46,6 @@ OBJECTS = $(SOURCES:.c=.o) # Undefined for now LOCAL_CFLAGS = -D_EGL_PLATFORM_X=1 -LIBS = -lX11 - .c.o: $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $(LOCAL_CFLAGS) $< -o $@ @@ -63,7 +61,8 @@ library: $(TOP)/$(LIB_DIR)/libEGL.so $(TOP)/$(LIB_DIR)/libEGL.so: $(OBJECTS) $(MKLIB) -o EGL -linker '$(CC)' -ldflags '$(LDFLAGS)' \ -major 1 -minor 0 \ - -install $(TOP)/$(LIB_DIR) -ldl $(OBJECTS) $(LIBS) + -install $(TOP)/$(LIB_DIR) \ + $(EGL_LIB_DEPS) $(OBJECTS) install: $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR) |