commit 8dbb78f

Makefile: Use better variable names for shared library and links

 1@@ -14,11 +14,11 @@ VERSION_MAJOR   := 0
 2 VERSION_MINOR   := 0
 3 VERSION         := $(VERSION_MAJOR).$(VERSION_MINOR)
 4 
 5-WLD_LIB         := libwld.so
 6-WLD_LIB_MAJOR   := $(WLD_LIB).$(VERSION_MAJOR)
 7-WLD_LIB_MINOR   := $(WLD_LIB_MAJOR).$(VERSION_MINOR)
 8+WLD_LIB_LINK    := libwld.so
 9+WLD_LIB_SONAME  := $(WLD_LIB_LINK).$(VERSION_MAJOR)
10+WLD_LIB         := $(WLD_LIB_LINK).$(VERSION)
11 
12-TARGETS         := wld.pc libwld.a $(WLD_LIB) $(WLD_LIB_MAJOR) $(WLD_LIB_MINOR)
13+TARGETS         := wld.pc libwld.a $(WLD_LIB) $(WLD_LIB_LINK) $(WLD_LIB_SONAME)
14 CLEAN_FILES     := $(TARGETS)
15 
16 WLD_REQUIRES = fontconfig pixman-1
17@@ -141,10 +141,10 @@ wld.pc: wld.pc.in
18 libwld.a: $(WLD_STATIC_OBJECTS)
19 	$(call quiet,AR) cr $@ $^
20 
21-$(WLD_LIB_MINOR): $(WLD_SHARED_OBJECTS)
22-	$(link) $(WLD_PACKAGE_LIBS) -shared -Wl,-soname,$(WLD_LIB_MAJOR),-no-undefined
23+$(WLD_LIB): $(WLD_SHARED_OBJECTS)
24+	$(link) $(WLD_PACKAGE_LIBS) -shared -Wl,-soname,$(WLD_LIB_SONAME),-no-undefined
25 
26-$(WLD_LIB_MAJOR) $(WLD_LIB): $(WLD_LIB_MINOR)
27+$(WLD_LIB_SONAME) $(WLD_LIB_LINK): $(WLD_LIB)
28 	$(call quiet,SYM,ln -sf) $< $@
29 
30 $(foreach dir,LIB PKGCONFIG,$(DESTDIR)$($(dir)DIR)) $(DESTDIR)$(INCLUDEDIR)/wld:
31@@ -155,9 +155,9 @@ install: $(TARGETS) | $(foreach dir,LIB PKGCONFIG,$(DESTDIR)$($(dir)DIR)) $(DEST
32 	install -m0644 wld.pc "$(DESTDIR)$(PKGCONFIGDIR)"
33 	install -m0644 $(WLD_HEADERS) "$(DESTDIR)$(INCLUDEDIR)/wld"
34 	install -m0644 libwld.a "$(DESTDIR)$(LIBDIR)"
35-	install -m0755 $(WLD_LIB_MINOR) "$(DESTDIR)$(LIBDIR)"
36-	ln -sf $(WLD_LIB_MINOR) "$(DESTDIR)$(LIBDIR)/$(WLD_LIB_MAJOR)"
37-	ln -sf $(WLD_LIB_MINOR) "$(DESTDIR)$(LIBDIR)/$(WLD_LIB)"
38+	install -m0755 $(WLD_LIB) "$(DESTDIR)$(LIBDIR)"
39+	ln -sf $(WLD_LIB) "$(DESTDIR)$(LIBDIR)/$(WLD_LIB_LINK)"
40+	ln -sf $(WLD_LIB) "$(DESTDIR)$(LIBDIR)/$(WLD_LIB_SONAME)"
41 
42 .PHONY: clean
43 clean: