Some more Makefile magic to avoid repeating the source files which make up a binary

diff --git a/Makefile b/Makefile
index cfa88c33684df4b978f51f8404e0fdbaaa089fee..d9c3030e00eaba39f569752ea9670bfe19a252db 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,22 +14,22 @@ all: $(BINARIES)
 # the API used to draw: compile in glutil_gl1.cpp or glutil_gl2.cpp
 
 glxtest: $(COMMON_SRC) $(COMMON_HDR) glutil_gl1.cpp glxbackend.cpp glxbackend.h
 # the API used to draw: compile in glutil_gl1.cpp or glutil_gl2.cpp
 
 glxtest: $(COMMON_SRC) $(COMMON_HDR) glutil_gl1.cpp glxbackend.cpp glxbackend.h

-       g++ $(CFLAGS) -DWIN_GLX -DCON_GL1 $(COMMON_SRC) glutil_gl1.cpp glxbackend.cpp -lGL $(COMMON_LD) -o $@
+       g++ $(CFLAGS) -DWIN_GLX -DCON_GL1 $^ -lGL $(COMMON_LD) -o $@

 
 egltest: $(COMMON_SRC) $(COMMON_HDR) glutil_gl1.cpp eglbackend.cpp eglbackend.h
 
 egltest: $(COMMON_SRC) $(COMMON_HDR) glutil_gl1.cpp eglbackend.cpp eglbackend.h

-       g++ $(CFLAGS) -DWIN_EGL -DCON_GL1 $(COMMON_SRC) glutil_gl1.cpp eglbackend.cpp -lEGL -lGL $(COMMON_LD) -o $@
+       g++ $(CFLAGS) -DWIN_EGL -DCON_GL1 $^ -lEGL -lGL $(COMMON_LD) -o $@

 
 glx2test: $(COMMON_SRC) $(COMMON_HDR) glutil_gl2.cpp glxbackend.cpp glxbackend.h
 
 glx2test: $(COMMON_SRC) $(COMMON_HDR) glutil_gl2.cpp glxbackend.cpp glxbackend.h

-       g++ $(CFLAGS) -DWIN_GLX -DCON_GL1 $(COMMON_SRC) glutil_gl2.cpp glxbackend.cpp -lGL $(COMMON_LD) -o $@
+       g++ $(CFLAGS) -DWIN_GLX -DCON_GL1 $^ -lGL $(COMMON_LD) -o $@

 
 egl2test: $(COMMON_SRC) $(COMMON_HDR) glutil_gl2.cpp eglbackend.cpp eglbackend.h
 
 egl2test: $(COMMON_SRC) $(COMMON_HDR) glutil_gl2.cpp eglbackend.cpp eglbackend.h

-       g++ $(CFLAGS) -DWIN_EGL -DCON_GL1 $(COMMON_SRC) glutil_gl2.cpp eglbackend.cpp -lEGL -lGL $(COMMON_LD) -o $@
+       g++ $(CFLAGS) -DWIN_EGL -DCON_GL1 $^ -lEGL -lGL $(COMMON_LD) -o $@

 
 glestest: $(COMMON_SRC) $(COMMON_HDR) glutil_gl2.cpp eglbackend.cpp eglbackend.h
 
 glestest: $(COMMON_SRC) $(COMMON_HDR) glutil_gl2.cpp eglbackend.cpp eglbackend.h

-       g++ $(CFLAGS) -DWIN_EGL -DCON_GLES2 $(COMMON_SRC) glutil_gl2.cpp eglbackend.cpp -lEGL -lGLESv2 $(COMMON_LD) -o $@
+       g++ $(CFLAGS) -DWIN_EGL -DCON_GLES2 $^ -lEGL -lGLESv2 $(COMMON_LD) -o $@

 
 eglinfo: eglinfo.c
 
 eglinfo: eglinfo.c

-       gcc $(CFLAGS) eglinfo.c -lEGL -lGL -lX11 -o $@
+       gcc $(CFLAGS) $^ -lEGL -lGL -lX11 -o $@

 
 clean:
        rm -f $(BINARIES)
 
 clean:
        rm -f $(BINARIES)