diff options
author | Brian Paul <brian.paul@tungstengraphics.com> | 2006-07-13 02:50:27 +0000 |
---|---|---|
committer | Brian Paul <brian.paul@tungstengraphics.com> | 2006-07-13 02:50:27 +0000 |
commit | 883f9891cb203dd087843b830ab058d6c9e160dc (patch) | |
tree | b1aec97f592e2ee8e2bd4c25a0123cf5ab95780b /src/egl | |
parent | d9eff8ba1943fbffb88562d84ba1fd9a56be07f0 (diff) | |
download | external_mesa3d-883f9891cb203dd087843b830ab058d6c9e160dc.zip external_mesa3d-883f9891cb203dd087843b830ab058d6c9e160dc.tar.gz external_mesa3d-883f9891cb203dd087843b830ab058d6c9e160dc.tar.bz2 |
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.
Diffstat (limited to 'src/egl')
-rw-r--r-- | src/egl/drivers/demo/Makefile | 6 | ||||
-rw-r--r-- | src/egl/drivers/dri/Makefile | 6 | ||||
-rw-r--r-- | src/egl/main/Makefile | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/egl/drivers/demo/Makefile b/src/egl/drivers/demo/Makefile index fd587b7..5c05633 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 86f189c..cb11971 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 45a4fb3..431eda4 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) |