X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=Makefile;h=b679e99116b42b9a4ccbba5e8718bd4ebd6a4875;hb=2d15ef7d6288368075d2717c0134a0439b7e339a;hp=5ab342a8cebb55c0b1a70871ff14306b03859588;hpb=f5afe7a34b5f7adc8451f01db92be1de5f0830af;p=glaze

diff --git a/Makefile b/Makefile
index 5ab342a..b679e99 100644
--- 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,11 +46,17 @@ all: $(TARGETS)
 
 GLAZE_CFLAGS = $(CFLAGS) $(WARN_CFLAGS)
 
+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 $@ $<
+	$(CC) $(GLAZE_CFLAGS) -m32 -fPIC -shared -Wl,--version-script=libglaze.sym,-soname=$(LIBGLAZE_SONAME) -ldl -ltalloc -o $@ $<
 
 $(LIBGLAZE_LIBNAME): libglaze.c
-	$(CC) $(GLAZE_CFLAGS) -m64 -fPIC -shared -Wl,-Bsymbolic,-soname=$(LIBGLAZE_SONAME) -ldl -ltalloc -o $@ $<
+	$(CC) $(GLAZE_CFLAGS) -m64 -fPIC -shared -Wl,--version-script=libglaze.sym,-soname=$(LIBGLAZE_SONAME) -ldl -ltalloc -o $@ $<
+
+$(LIBGLAZE_LINKER_NAME): $(LIBGLAZE_LIBNAME)
+	ln -sf $(LIBGLAZE_LIBNAME) $@
 
 $(LIB64_DIR)/libGL.so.1: glaze-gl.c
 	mkdir -p $(LIB64_DIR)
@@ -70,6 +78,7 @@ 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)