Return to patch-src_Makefile CVS log

Up to [local] / qmapshack / routino / patches

Initial revision

$OpenBSD$
--- src/Makefile.orig	Tue Sep 29 21:09:59 2015
+++ src/Makefile	Sun Apr  3 20:24:59 2016
@@ -38,9 +38,7 @@ EXE=planetsplitter$(.EXE) planetsplitter-slim$(.EXE) r
     router+lib$(.EXE) router+lib-slim$(.EXE)
 
 ifneq ($(HOST),MINGW)
-LIB =libroutino.so               libroutino-slim.so
-LIB+=libroutino.so.$(SOVERSION)  libroutino-slim.so.$(SOVERSION)
-LIB+=libroutino.so.$(LIBVERSION) libroutino-slim.so.$(LIBVERSION)
+LIB =libroutino.so.${libroutino_ltversion}               libroutino-slim.so.${libroutino_slim_ltversion}
 else
 LIB =routino.dll routino-slim.dll
 LIB+=routino.def routino-slim.def
@@ -50,8 +48,8 @@ endif
 INC=routino.h
 
 ifneq ($(HOST),MINGW)
-LINK_LIB=libroutino.so
-LINK_SLIM_LIB=libroutino-slim.so
+LINK_LIB=libroutino.so.${libroutino_ltversion}
+LINK_SLIM_LIB=libroutino-slim.so.${libroutino_slim_ltversion}
 else
 LINK_LIB=routino.dll
 LINK_SLIM_LIB=routino-slim.dll
@@ -206,15 +204,9 @@ ifeq ($(HOST),MINGW)
 LIBROUTINO_OBJ+=mman-win32.o
 endif
 
-libroutino.so.$(LIBVERSION) : $(LIBROUTINO_OBJ)
+libroutino.so.${libroutino_ltversion} : $(LIBROUTINO_OBJ)
 	$(LD) $^ -o $@ $(LDFLAGS) $(LDFLAGS_LIB) $(LDFLAGS_SONAME)
 
-libroutino.so.$(SOVERSION) : libroutino.so.$(LIBVERSION)
-	ln -sf $< $@
-
-libroutino.so : libroutino.so.$(LIBVERSION)
-	ln -sf $< $@
-
 routino.dll : $(LIBROUTINO_OBJ)
 	$(LD) $^ -o $@ $(LDFLAGS) $(LDFLAGS_LIB)
 
@@ -236,15 +228,9 @@ ifeq ($(HOST),MINGW)
 LIBROUTINO_SLIM_OBJ+=mman-win32.o
 endif
 
-libroutino-slim.so.$(LIBVERSION) : $(LIBROUTINO_SLIM_OBJ)
+libroutino-slim.so.${libroutino_slim_ltversion} : $(LIBROUTINO_SLIM_OBJ)
 	$(LD) $^ -o $@ $(LDFLAGS) $(LDFLAGS_LIB) $(LDFLAGS_SLIM_SONAME)
 
-libroutino-slim.so.$(SOVERSION) : libroutino-slim.so.$(LIBVERSION)
-	ln -sf $< $@
-
-libroutino-slim.so : libroutino-slim.so.$(LIBVERSION)
-	ln -sf $< $@
-
 routino-slim.dll : $(LIBROUTINO_SLIM_OBJ)
 	$(LD) $^ -o $@ $(LDFLAGS) $(LDFLAGS_LIB)
 
@@ -299,7 +285,7 @@ install-local: all-local
 	@for file in $(LIB); do \
 	    if [ -f $$file ]; then \
 	       echo cp $$file $(DESTDIR)$(libdir) ;\
-	       cp -df $$file $(DESTDIR)$(libdir) ;\
+	       cp -f $$file $(DESTDIR)$(libdir) ;\
 	    fi ;\
 	 done