Add support for multiple Glaze wrappers to be used at the same time.

[glaze] / Makefile

diff --git a/Makefile b/Makefile
index 7322ae3d96f55bee8e55942c23d76864b46744c4..d881b38df1901deb9b8ee54fc64c7654dcd993af 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -28,6 +28,8 @@ LIBGLAZE_32_LINKER_NAME = libglaze-32.so
 LIBGLAZE_32_SONAME = $(LIBGLAZE_32_LINKER_NAME).$(MAJOR)
 LIBGLAZE_32_LIBNAME = $(LIBGLAZE_32_SONAME).$(MINOR).$(RELEASE)
 
+TARGETS = glaze
+
 ifeq ($(COMPILER_SUPPORTS_32),Yes)
 TARGETS += $(LIBGLAZE_32_LIBNAME)
 TARGETS += $(LIB32_DIR)/libGL.so.1
@@ -44,13 +46,19 @@ all: $(TARGETS)
 
 GLAZE_CFLAGS = $(CFLAGS) $(WARN_CFLAGS)
 
-$(LIBGLAZE_32_LIBNAME): glaze.c
+glaze: glaze.c $(LIBGLAZE_LINKER_NAME)
+       $(CC) $(GLAZE_CFLAGS) -I. -L. -o $@ $< -ldl -lglaze
+
+$(LIBGLAZE_32_LIBNAME): libglaze.c
        $(CC) $(GLAZE_CFLAGS) -m32 -fPIC -shared -Wl,-Bsymbolic,-soname=$(LIBGLAZE_SONAME) -ldl -ltalloc -o $@ $<
 
-$(LIBGLAZE_LIBNAME): glaze.c
+$(LIBGLAZE_LIBNAME): libglaze.c
        $(CC) $(GLAZE_CFLAGS) -m64 -fPIC -shared -Wl,-Bsymbolic,-soname=$(LIBGLAZE_SONAME) -ldl -ltalloc -o $@ $<
 
-$(LIB64_DIR)/libGL.so.1: glaze-gl.c glapi.def
+$(LIBGLAZE_LINKER_NAME): $(LIBGLAZE_LIBNAME)
+       ln -sf $(LIBGLAZE_LIBNAME) $@
+
+$(LIB64_DIR)/libGL.so.1: glaze-gl.c
        mkdir -p $(LIB64_DIR)
        $(CC) $(GLAZE_CFLAGS) -DGLAZE_BITS=64 -m64 -fPIC -shared -Wl,-Bsymbolic -o $@ $<
 
@@ -70,9 +78,11 @@ install: all
        install -m0644 glaze.h $(DESTDIR)$(INCLUDEDIR)/glaze
        mkdir -p $(DESTDIR)$(BINDIR)
        mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
+       install -m0755 glaze $(DESTDIR)$(BINDIR)
 ifeq ($(COMPILER_SUPPORTS_32),Yes)
        mkdir -p $(DESTDIR)$(LIBDIR)/glaze/$(LIB32_DIR)
        install -m0644 $(LIB32_DIR)/libGL.so.1 $(DESTDIR)$(LIBDIR)/glaze/$(LIB32_DIR)
+       ln -sf libGL.so.1 $(DESTDIR)$(LIBDIR)/glaze/$(LIB32_DIR)/libGL.so
        install -m0644 $(LIBGLAZE_32_LIBNAME) $(DESTDIR)$(LIBDIR)
        ln -sf $(LIBGLAZE_32_LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBGLAZE_32_SONAME)
        ln -sf $(LIBGLAZE_32_LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBGLAZE_32_LINKER_NAME)
@@ -82,6 +92,7 @@ endif
 ifeq ($(COMPILER_SUPPORTS_64),Yes)
        mkdir -p $(DESTDIR)$(LIBDIR)/glaze/$(LIB64_DIR)
        install -m0644 $(LIB64_DIR)/libGL.so.1 $(DESTDIR)$(LIBDIR)/glaze/$(LIB64_DIR)
+       ln -sf libGL.so.1 $(DESTDIR)$(LIBDIR)/glaze/$(LIB64_DIR)/libGL.so
        install -m0644 $(LIBGLAZE_LIBNAME) $(DESTDIR)$(LIBDIR)
        ln -sf $(LIBGLAZE_LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBGLAZE_SONAME)
        ln -sf $(LIBGLAZE_LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBGLAZE_LINKER_NAME)