From 883f9891cb203dd087843b830ab058d6c9e160dc Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 13 Jul 2006 02:50:27 +0000 Subject: 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. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- progs/egl/Makefile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'progs/egl') diff --git a/progs/egl/Makefile b/progs/egl/Makefile index 41cadf97d2c..33447a9d575 100644 --- a/progs/egl/Makefile +++ b/progs/egl/Makefile @@ -24,36 +24,36 @@ PROGRAMS = \ default: $(PROGRAMS) -demo1: demo1.o $(LIB_DIR)/libEGL.so - $(CC) $(CFLAGS) demo1.o -L$(LIB_DIR) -lEGL $(LIBDRM_LIB) -o $@ +demo1: demo1.o $(TOP)/$(LIB_DIR)/libEGL.so + $(CC) $(CFLAGS) demo1.o -L$(TOP)/$(LIB_DIR) -lEGL $(LIBDRM_LIB) -o $@ demo1.o: demo1.c $(HEADERS) $(CC) -c $(CFLAGS) -I$(TOP)/include demo1.c -demo2: demo2.o $(LIB_DIR)/libEGL.so - $(CC) $(CFLAGS) demo2.o -L$(LIB_DIR) -lEGL $(LIBDRM_LIB) $(APP_LIB_DEPS) -o $@ +demo2: demo2.o $(TOP)/$(LIB_DIR)/libEGL.so + $(CC) $(CFLAGS) demo2.o -L$(TOP)/$(LIB_DIR) -lEGL $(LIBDRM_LIB) $(APP_LIB_DEPS) -o $@ demo2.o: demo2.c $(HEADERS) $(CC) -c $(CFLAGS) -I$(TOP)/include demo2.c -demo3: demo3.o $(LIB_DIR)/libEGL.so - $(CC) $(CFLAGS) demo3.o -L$(LIB_DIR) -lEGL $(LIBDRM_LIB) $(APP_LIB_DEPS) -o $@ +demo3: demo3.o $(TOP)/$(LIB_DIR)/libEGL.so + $(CC) $(CFLAGS) demo3.o -L$(TOP)/$(LIB_DIR) -lEGL $(LIBDRM_LIB) $(APP_LIB_DEPS) -o $@ demo3.o: demo3.c $(HEADERS) $(CC) -c $(CFLAGS) -I$(TOP)/include demo3.c -eglinfo: eglinfo.o $(LIB_DIR)/libEGL.so - $(CC) $(CFLAGS) eglinfo.o -L$(LIB_DIR) -lEGL $(LIBDRM_LIB) -o $@ +eglinfo: eglinfo.o $(TOP)/$(LIB_DIR)/libEGL.so + $(CC) $(CFLAGS) eglinfo.o -L$(TOP)/$(LIB_DIR) -lEGL $(LIBDRM_LIB) -o $@ eglinfo.o: eglinfo.c $(HEADERS) $(CC) -c $(CFLAGS) -I$(TOP)/include eglinfo.c -eglgears: eglgears.o $(LIB_DIR)/libEGL.so - $(CC) $(CFLAGS) eglgears.o -L$(LIB_DIR) -lEGL $(LIBDRM_LIB) $(APP_LIB_DEPS) -o $@ +eglgears: eglgears.o $(TOP)/$(LIB_DIR)/libEGL.so + $(CC) $(CFLAGS) eglgears.o -L$(TOP)/$(LIB_DIR) -lEGL $(LIBDRM_LIB) $(APP_LIB_DEPS) -o $@ eglgears.o: eglgears.c $(HEADERS) $(CC) -c $(CFLAGS) -I$(TOP)/include eglgears.c -- cgit v1.2.3