From 9420e2050a321aeeb7bc8d4aff179cd976ed2e34 Mon Sep 17 00:00:00 2001
From: Markus Gans <guru@server.home.net>
Date: Sun, 12 Jul 2015 18:54:27 +0200
Subject: [PATCH] Makefile update

---
 src/Makefile.clang | 18 ++++++++++--------
 src/Makefile.gcc   | 16 +++++++++-------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/Makefile.clang b/src/Makefile.clang
index ab08d97f..cc0f4eba 100644
--- a/src/Makefile.clang
+++ b/src/Makefile.clang
@@ -3,6 +3,8 @@
 #-----------------------------------------------------------------------------
 
 # This is where make install will install the library
+VERSION = "0.1.1"
+MAJOR := $(shell echo ${VERSION} | cut -d. -f1)
 LIBDIR = /usr/local/lib64
 INCLUDEDIR = /usr/local/include/final
 INCLUDE_HEADERS = fapp.h \
@@ -45,7 +47,6 @@ LIB = libfinal.so
 OBJS = fstring.o \
        fpoint.o \
        frect.o \
-       fswitch.o \
        fscrollbar.o \
        fprogressbar.o \
        flineedit.o \
@@ -54,6 +55,7 @@ OBJS = fstring.o \
        ftogglebutton.o \
        fradiobutton.o \
        fcheckbox.o \
+       fswitch.o \
        flabel.o \
        flistbox.o \
        fdialog.o \
@@ -85,9 +87,9 @@ endif
 	$(CXX) -c $(CCXFLAGS) -fpic -o $@ $<
 
 all: dep $(OBJS) 
-	$(CXX) $(CCXFLAGS) $(INCLUDES) $(LDFLAGS) -shared -Wl,-soname,$(LIB).0 -o $(LIB).0.1.1 $(OBJS)
-	ln -s -f $(LIB).0.1.1 libfinal.so.0
-	ln -s -f $(LIB).0 libfinal.so
+	$(CXX) $(CCXFLAGS) $(INCLUDES) $(LDFLAGS) -shared -Wl,-soname,$(LIB).$(MAJOR) -o $(LIB).$(VERSION) $(OBJS)
+	ln -s -f $(LIB).$(VERSION) libfinal.so.$(MAJOR)
+	ln -s -f $(LIB).$(MAJOR) libfinal.so
 
 $(LIB): all
 
@@ -99,9 +101,9 @@ profile:
 
 install: $(LIB)
 	mkdir -p $(LIBDIR)
-	install -c $(LIB).0.1.1 $(LIBDIR)/$(LIB).0.1.1
-	ln -s -f $(LIB).0.1.1 $(LIBDIR)/libfinal.so.0
-	ln -s -f $(LIB).0 $(LIBDIR)/libfinal.so
+	install -c $(LIB).$(VERSION) $(LIBDIR)/$(LIB).$(VERSION)
+	ln -s -f $(LIB).$(VERSION) $(LIBDIR)/libfinal.so.$(MAJOR)
+	ln -s -f $(LIB).$(MAJOR) $(LIBDIR)/libfinal.so
 	ldconfig
 	mkdir -p $(INCLUDEDIR)
 	@list='$(INCLUDE_HEADERS)'; for h in $$list; \
@@ -110,7 +112,7 @@ install: $(LIB)
 	done
 
 uninstall: $(INCLUDE_HEADERS)
-	$(RM) $(LIBDIR)/$(LIB).0.1.1 $(LIBDIR)/libfinal.so.0 $(LIBDIR)/libfinal.so
+	$(RM) $(LIBDIR)/$(LIB).$(VERSION) $(LIBDIR)/libfinal.so.$(MAJOR) $(LIBDIR)/libfinal.so
 	@list='$(INCLUDE_HEADERS)'; for h in $$list; \
 	do \
 	  $(RM) $(INCLUDEDIR)/$$h; \
diff --git a/src/Makefile.gcc b/src/Makefile.gcc
index 1e6a5831..5ccd8daa 100644
--- a/src/Makefile.gcc
+++ b/src/Makefile.gcc
@@ -3,6 +3,8 @@
 #-----------------------------------------------------------------------------
 
 # This is where make install will install the library
+VERSION = "0.1.1"
+MAJOR := $(shell echo ${VERSION} | cut -d. -f1)
 LIBDIR = /usr/local/lib64
 INCLUDEDIR = /usr/local/include/final
 INCLUDE_HEADERS = fapp.h \
@@ -85,9 +87,9 @@ endif
 	$(CXX) -c $(CCXFLAGS) -fpic -o $@ $<
 
 all: dep $(OBJS) 
-	$(CXX) $(CCXFLAGS) $(INCLUDES) $(LDFLAGS) -shared -Wl,-soname,$(LIB).0 -o $(LIB).0.1.1 $(OBJS)
-	ln -s -f $(LIB).0.1.1 libfinal.so.0
-	ln -s -f $(LIB).0 libfinal.so
+	$(CXX) $(CCXFLAGS) $(INCLUDES) $(LDFLAGS) -shared -Wl,-soname,$(LIB).$(MAJOR) -o $(LIB).$(VERSION) $(OBJS)
+	ln -s -f $(LIB).$(VERSION) libfinal.so.$(MAJOR)
+	ln -s -f $(LIB).$(MAJOR) libfinal.so
 
 $(LIB): all
 
@@ -99,9 +101,9 @@ profile:
 
 install: $(LIB)
 	mkdir -p $(LIBDIR)
-	install -c $(LIB).0.1.1 $(LIBDIR)/$(LIB).0.1.1
-	ln -s -f $(LIB).0.1.1 $(LIBDIR)/libfinal.so.0
-	ln -s -f $(LIB).0 $(LIBDIR)/libfinal.so
+	install -c $(LIB).$(VERSION) $(LIBDIR)/$(LIB).$(VERSION)
+	ln -s -f $(LIB).$(VERSION) $(LIBDIR)/libfinal.so.$(MAJOR)
+	ln -s -f $(LIB).$(MAJOR) $(LIBDIR)/libfinal.so
 	ldconfig
 	mkdir -p $(INCLUDEDIR)
 	@list='$(INCLUDE_HEADERS)'; for h in $$list; \
@@ -110,7 +112,7 @@ install: $(LIB)
 	done
 
 uninstall: $(INCLUDE_HEADERS)
-	$(RM) $(LIBDIR)/$(LIB).0.1.1 $(LIBDIR)/libfinal.so.0 $(LIBDIR)/libfinal.so
+	$(RM) $(LIBDIR)/$(LIB).$(VERSION) $(LIBDIR)/libfinal.so.$(MAJOR) $(LIBDIR)/libfinal.so
 	@list='$(INCLUDE_HEADERS)'; for h in $$list; \
 	do \
 	  $(RM) $(INCLUDEDIR)/$$h; \