diff options
| -rw-r--r-- | progs/egl/Makefile | 99 | ||||
| -rw-r--r-- | progs/openvg/demos/Makefile | 2 | ||||
| -rw-r--r-- | progs/openvg/trivial/Makefile | 2 |
3 files changed, 29 insertions, 74 deletions
diff --git a/progs/egl/Makefile b/progs/egl/Makefile index fd72f540cae..ff9a858c569 100644 --- a/progs/egl/Makefile +++ b/progs/egl/Makefile @@ -7,6 +7,9 @@ include $(TOP)/configs/current INCLUDE_DIRS = -I$(TOP)/include HEADERS = $(TOP)/include/GLES/egl.h +LIB_DEP = $(TOP)/$(LIB_DIR)/libEGL.so + +LIBS = -L$(TOP)/$(LIB_DIR) -lEGL -lGL PROGRAMS = \ demo1 \ @@ -30,90 +33,42 @@ PROGRAMS = \ default: $(PROGRAMS) +demo1: demo1.o $(HEADERS) $(LIB_DEP) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(LIBDRM_LIB) -demo1: demo1.o $(TOP)/$(LIB_DIR)/libEGL.so - $(CC) $(CFLAGS) $(LDFLAGS) 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 $(TOP)/$(LIB_DIR)/libEGL.so - $(CC) $(CFLAGS) $(LDFLAGS) demo2.o -L$(TOP)/$(LIB_DIR) -lEGL -lGL $(LIBDRM_LIB) $(APP_LIB_DEPS) -o $@ - -demo2.o: demo2.c $(HEADERS) - $(CC) -c $(CFLAGS) -I$(TOP)/include demo2.c - - -demo3: demo3.o $(TOP)/$(LIB_DIR)/libEGL.so - $(CC) $(CFLAGS) $(LDFLAGS) demo3.o -L$(TOP)/$(LIB_DIR) -lEGL -lGL $(LIBDRM_LIB) $(APP_LIB_DEPS) -o $@ - -demo3.o: demo3.c $(HEADERS) - $(CC) -c $(CFLAGS) -I$(TOP)/include demo3.c - - -egltri: egltri.o $(TOP)/$(LIB_DIR)/libEGL.so - $(CC) $(CFLAGS) egltri.o -L$(TOP)/$(LIB_DIR) -lEGL -lGL $(LIBDRM_LIB) -o $@ - -egltri.o: egltri.c $(HEADERS) - $(CC) -c $(CFLAGS) -I$(TOP)/include egltri.c - +demo2: demo2.o $(HEADERS) $(LIB_DEP) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(LIBDRM_LIB) -eglinfo: eglinfo.o $(TOP)/$(LIB_DIR)/libEGL.so - $(CC) $(CFLAGS) $(LDFLAGS) eglinfo.o -L$(TOP)/$(LIB_DIR) -lEGL -lGL $(LIBDRM_LIB) -o $@ +demo3: demo3.o $(HEADERS) $(LIB_DEP) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(LIBDRM_LIB) -eglinfo.o: eglinfo.c $(HEADERS) - $(CC) -c $(CFLAGS) -I$(TOP)/include eglinfo.c +egltri: egltri.o $(HEADERS) $(LIB_DEP) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(LIBDRM_LIB) +eglinfo: eglinfo.o $(HEADERS) $(LIB_DEP) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(LIBDRM_LIB) -eglgears: eglgears.o $(TOP)/$(LIB_DIR)/libEGL.so - $(CC) $(CFLAGS) $(LDFLAGS) eglgears.o -L$(TOP)/$(LIB_DIR) -lEGL -lGL $(LIBDRM_LIB) $(APP_LIB_DEPS) -o $@ +eglgears: eglgears.o $(HEADERS) $(LIB_DEP) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(LIBDRM_LIB) -eglgears.o: eglgears.c $(HEADERS) - $(CC) -c $(CFLAGS) -I$(TOP)/include eglgears.c +eglscreen: eglscreen.o $(HEADERS) $(LIB_DEP) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(LIBDRM_LIB) -eglscreen: eglscreen.o $(TOP)/$(LIB_DIR)/libEGL.so - $(CC) $(CFLAGS) $(LDFLAGS) eglscreen.o -L$(TOP)/$(LIB_DIR) -lEGL -lGL $(LIBDRM_LIB) $(APP_LIB_DEPS) -o $@ +peglgears: peglgears.o $(HEADERS) $(LIB_DEP) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(LIBDRM_LIB) -eglscreen.o: eglscreen.c $(HEADERS) - $(CC) -c $(CFLAGS) -I$(TOP)/include eglscreen.c +xeglbindtex: xeglbindtex.o $(HEADERS) $(LIB_DEP) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) -lX11 -peglgears: peglgears.o $(TOP)/$(LIB_DIR)/libEGL.so - $(CC) $(CFLAGS) peglgears.o -L$(TOP)/$(LIB_DIR) -lEGL -lGL $(LIBDRM_LIB) $(APP_LIB_DEPS) -o $@ +xeglgears: xeglgears.o $(HEADERS) $(LIB_DEP) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) -lX11 -peglgears.o: peglgears.c $(HEADERS) - $(CC) -c $(CFLAGS) -I$(TOP)/include peglgears.c - - -xeglbindtex: xeglbindtex.o $(TOP)/$(LIB_DIR)/libEGL.so - $(CC) $(CFLAGS) xeglbindtex.o -L$(TOP)/$(LIB_DIR) -lEGL -lGL $(LIBDRM_LIB) $(APP_LIB_DEPS) -o $@ - -xeglbindtex.o: xeglbindtex.c $(HEADERS) - $(CC) -c $(CFLAGS) -I$(TOP)/include xeglbindtex.c - -xeglgears: xeglgears.o $(TOP)/$(LIB_DIR)/libEGL.so - $(CC) $(CFLAGS) xeglgears.o -L$(TOP)/$(LIB_DIR) -lEGL -lGL $(LIBDRM_LIB) $(APP_LIB_DEPS) -o $@ - -xeglgears.o: xeglgears.c $(HEADERS) - $(CC) -c $(CFLAGS) -I$(TOP)/include xeglgears.c - - -xeglthreads: xeglthreads.o $(TOP)/$(LIB_DIR)/libEGL.so - $(CC) $(CFLAGS) xeglthreads.o -L$(TOP)/$(LIB_DIR) -lEGL -lGL $(LIBDRM_LIB) $(APP_LIB_DEPS) -o $@ - -xeglthreads.o: xeglthreads.c $(HEADERS) - $(CC) -c $(CFLAGS) -I$(TOP)/include xeglthreads.c - - -xegl_tri: xegl_tri.o $(TOP)/$(LIB_DIR)/libEGL.so - $(CC) $(CFLAGS) xegl_tri.o -L$(TOP)/$(LIB_DIR) -lEGL -lGL $(LIBDRM_LIB) $(APP_LIB_DEPS) -o $@ - -xegl_tri.o: xegl_tri.c $(HEADERS) - $(CC) -c $(CFLAGS) -I$(TOP)/include xegl_tri.c +xeglthreads: xeglthreads.o $(HEADERS) $(LIB_DEP) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) -lX11 +xegl_tri: xegl_tri.o $(HEADERS) $(LIB_DEP) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) -lX11 clean: -rm -f *.o *~ - -rm -f *.so -rm -f $(PROGRAMS) - diff --git a/progs/openvg/demos/Makefile b/progs/openvg/demos/Makefile index 6e15342c7ff..89b0ce441bb 100644 --- a/progs/openvg/demos/Makefile +++ b/progs/openvg/demos/Makefile @@ -3,7 +3,7 @@ TOP = ../../.. include $(TOP)/configs/current -VG_LIBS=-lm -pthread -lEGL -lOpenVG +VG_LIBS=-lm -pthread -lX11 -lEGL -lOpenVG INCLUDE_DIRS = -I$(TOP)/include PROGRAMS = \ diff --git a/progs/openvg/trivial/Makefile b/progs/openvg/trivial/Makefile index 362360e5963..fcb3484377e 100644 --- a/progs/openvg/trivial/Makefile +++ b/progs/openvg/trivial/Makefile @@ -5,7 +5,7 @@ TOP = ../../../ include $(TOP)/configs/current INCLUDES = -I. -I$(TOP)/include -LIBS=-L$(TOP)/$(LIB_DIR) -lm -lEGL -lOpenVG -lpthread +LIBS=-L$(TOP)/$(LIB_DIR) -lm -lX11 -lEGL -lOpenVG -lpthread CFLAGS += $(INCLUDES) HEADERS=eglcommon.h |