diff options
Diffstat (limited to 'progs')
| -rw-r--r-- | progs/demos/Makefile | 8 | ||||
| -rw-r--r-- | progs/directfb/Makefile | 2 | ||||
| -rw-r--r-- | progs/egl/Makefile | 20 | ||||
| -rw-r--r-- | progs/osdemos/Makefile | 8 | ||||
| -rw-r--r-- | progs/redbook/Makefile | 2 | ||||
| -rw-r--r-- | progs/samples/Makefile | 2 | ||||
| -rw-r--r-- | progs/slang/Makefile | 2 | ||||
| -rw-r--r-- | progs/xdemos/Makefile | 2 |
8 files changed, 23 insertions, 23 deletions
diff --git a/progs/demos/Makefile b/progs/demos/Makefile index 44b79c26f1..43d0f17c85 100644 --- a/progs/demos/Makefile +++ b/progs/demos/Makefile @@ -5,13 +5,13 @@ include $(TOP)/configs/current INCDIR = $(TOP)/include -OSMESA_LIBS = -L$(LIB_DIR) -lglut -lOSMesa -lGLU -lGL $(APP_LIB_DEPS) +OSMESA_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa -lGLU -lGL $(APP_LIB_DEPS) -OSMESA16_LIBS = -L$(LIB_DIR) -lglut -lOSMesa16 -lGLU -lGL $(APP_LIB_DEPS) +OSMESA16_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa16 -lGLU -lGL $(APP_LIB_DEPS) -OSMESA32_LIBS = -L$(LIB_DIR) -lglut -lOSMesa32 -lGLU -lGL $(APP_LIB_DEPS) +OSMESA32_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa32 -lGLU -lGL $(APP_LIB_DEPS) -LIB_DEP = $(LIB_DIR)/$(GL_LIB_NAME) $(LIB_DIR)/$(GLU_LIB_NAME) $(LIB_DIR)/$(GLUT_LIB_NAME) +LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) PROGS = \ arbfplight \ diff --git a/progs/directfb/Makefile b/progs/directfb/Makefile index a541c8ff9a..53b100a18d 100644 --- a/progs/directfb/Makefile +++ b/progs/directfb/Makefile @@ -6,7 +6,7 @@ include $(TOP)/configs/current INCDIR = $(TOP)/include -I$(TOP)/progs -LIB_DEP = $(LIB_DIR)/$(GL_LIB_NAME) $(LIB_DIR)/$(GLU_LIB_NAME) +LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) CFLAGS += $(shell pkg-config --cflags directfb) APP_LIB_DEPS += $(shell pkg-config --libs directfb) diff --git a/progs/egl/Makefile b/progs/egl/Makefile index 41cadf97d2..33447a9d57 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 diff --git a/progs/osdemos/Makefile b/progs/osdemos/Makefile index dbecfc6f54..f8cba9ee99 100644 --- a/progs/osdemos/Makefile +++ b/progs/osdemos/Makefile @@ -5,13 +5,13 @@ include $(TOP)/configs/current INCDIR = $(TOP)/include -OSMESA_LIBS = -L$(LIB_DIR) -lOSMesa $(APP_LIB_DEPS) +OSMESA_LIBS = -L$(TOP)/$(LIB_DIR) -lOSMesa $(APP_LIB_DEPS) -OSMESA16_LIBS = -L$(LIB_DIR) -lglut -lOSMesa16 -lGLU -lGL $(APP_LIB_DEPS) +OSMESA16_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa16 -lGLU -lGL $(APP_LIB_DEPS) -OSMESA32_LIBS = -L$(LIB_DIR) -lglut -lOSMesa32 -lGLU -lGL $(APP_LIB_DEPS) +OSMESA32_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa32 -lGLU -lGL $(APP_LIB_DEPS) -LIB_DEP = $(LIB_DIR)/$(GL_LIB_NAME) $(LIB_DIR)/$(GLU_LIB_NAME) $(LIB_DIR)/$(GLUT_LIB_NAME) +LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) PROGS = \ osdemo \ diff --git a/progs/redbook/Makefile b/progs/redbook/Makefile index 4cfbb9aeac..febc74441b 100644 --- a/progs/redbook/Makefile +++ b/progs/redbook/Makefile @@ -5,7 +5,7 @@ include $(TOP)/configs/current INCDIR = $(TOP)/include -LIB_DEP = $(LIB_DIR)/$(GL_LIB_NAME) $(LIB_DIR)/$(GLU_LIB_NAME) $(LIB_DIR)/$(GLUT_LIB_NAME) +LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) PROGS = aaindex aapoly aargb accanti accpersp alpha alpha3D anti \ bezcurve bezmesh checker clip colormat cube depthcue dof \ diff --git a/progs/samples/Makefile b/progs/samples/Makefile index f14b7dfc00..063008dccf 100644 --- a/progs/samples/Makefile +++ b/progs/samples/Makefile @@ -5,7 +5,7 @@ include $(TOP)/configs/current INCDIR = $(TOP)/include -LIB_DEP = $(LIB_DIR)/$(GL_LIB_NAME) $(LIB_DIR)/$(GLU_LIB_NAME) $(LIB_DIR)/$(GLUT_LIB_NAME) +LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) PROGS = accum bitmap1 bitmap2 blendeq blendxor copy cursor depth eval fog \ font line logo nurb olympic overlay point prim quad select \ diff --git a/progs/slang/Makefile b/progs/slang/Makefile index 90debd186a..70d60594d2 100644 --- a/progs/slang/Makefile +++ b/progs/slang/Makefile @@ -6,7 +6,7 @@ include $(TOP)/configs/current INCDIR = $(TOP)/include -LIB_DEP = $(LIB_DIR)/$(GL_LIB_NAME) +LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) # # targets diff --git a/progs/xdemos/Makefile b/progs/xdemos/Makefile index 37b9504e55..4ca8b107a2 100644 --- a/progs/xdemos/Makefile +++ b/progs/xdemos/Makefile @@ -6,7 +6,7 @@ include $(TOP)/configs/current INCDIR = $(TOP)/include -LIB_DEP = $(LIB_DIR)/$(GL_LIB_NAME) $(LIB_DIR)/$(GLU_LIB_NAME) +LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) PROGS = glthreads \ glxdemo \ |