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

diff --git a/Makefile b/Makefile
index f211722..b679e99 100644
--- a/Makefile
+++ b/Makefile
@@ -24,14 +24,20 @@ LIBGLAZE_LINKER_NAME = libglaze.so
 LIBGLAZE_SONAME = $(LIBGLAZE_LINKER_NAME).$(MAJOR)
 LIBGLAZE_LIBNAME = $(LIBGLAZE_SONAME).$(MINOR).$(RELEASE)
 
-TARGETS = $(LIBGLAZE_LIBNAME)
+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
 TARGETS += glaze-find-libgl-32
 endif
 
 ifeq ($(COMPILER_SUPPORTS_64),Yes)
+TARGETS += $(LIBGLAZE_LIBNAME)
 TARGETS += $(LIB64_DIR)/libGL.so.1
 TARGETS += glaze-find-libgl-64
 endif
@@ -40,10 +46,19 @@ all: $(TARGETS)
 
 GLAZE_CFLAGS = $(CFLAGS) $(WARN_CFLAGS)
 
-$(LIBGLAZE_LIBNAME): glaze.c
-	$(CC) $(GLAZE_CFLAGS) -fPIC -shared -Wl,-Bsymbolic,-soname=$(LIBGLAZE_SONAME) -ldl -ltalloc -o $@ $<
+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,--version-script=libglaze.sym,-soname=$(LIBGLAZE_SONAME) -ldl -ltalloc -o $@ $<
+
+$(LIBGLAZE_LIBNAME): libglaze.c
+	$(CC) $(GLAZE_CFLAGS) -m64 -fPIC -shared -Wl,--version-script=libglaze.sym,-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 $@ $<
 
@@ -59,26 +74,29 @@ glaze-find-libgl-64: glaze-find-libgl.c
 
 .PHONY: install
 install: all
-ifeq ($(COMPILER_SUPPORTS_64),Yes)
-	mkdir -p $(DESTDIR)$(LIBDIR)/glaze/$(LIB64_DIR)
-	install -m0644 $(LIB64_DIR)/libGL.so.1 $(DESTDIR)$(LIBDIR)/glaze/$(LIB64_DIR)
-endif
+	mkdir -p $(DESTDIR)$(INCLUDEDIR)/glaze
+	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)
+	install glaze-32.pc $(DESTDIR)$(LIBDIR)/pkgconfig
+	install -m0755 glaze-find-libgl-32 $(DESTDIR)$(BINDIR)
 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)
-	mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
 	install glaze.pc $(DESTDIR)$(LIBDIR)/pkgconfig
-	mkdir -p $(DESTDIR)$(INCLUDEDIR)/glaze
-	install -m0644 glaze.h $(DESTDIR)$(INCLUDEDIR)/glaze
-	mkdir -p $(DESTDIR)$(BINDIR)
-ifeq ($(COMPILER_SUPPORTS_32),Yes)
-	install -m0755 glaze-find-libgl-32 $(DESTDIR)$(BINDIR)
-endif
-ifeq ($(COMPILER_SUPPORTS_64),Yes)
 	install -m0755 glaze-find-libgl-64 $(DESTDIR)$(BINDIR)
 endif