--- Make/makedefs
+++ Make/makedefs
@@ -68,8 +68,8 @@
 
 INC        = -I$(TOPDIR)/include 
 
-CXXFLAGS   = $(ARCHARGS) $(DOF) $(DEF) $(INC)
-LDFLAGS    = $(ARCHARGS) $(DOF) $(LINKARGS) -L$(TOPDIR)/lib/$(OS)$(ARCH) 
+CXXFLAGS   += -Wall $(ARCHARGS) $(DEF) $(INC)
+LDFLAGS    += $(ARCHARGS) $(LINKARGS) -L$(TOPDIR)/lib/$(OS)$(ARCH) 
 OBJS       = $(CXXFILES:.cpp=.o) \
 	     $(C++FILES:.c++=.o) \
 	     	 $(CFILES:.c=.o) \
@@ -100,7 +100,7 @@
 INSTLINKCMD        = $(LINK)
 
 LIB_PREFIX         = lib
-LIB_EXT            = so
+LIB_EXT            = so.$(VERSION_MAJOR)
 
 MAKEDIST           = echo "   === Distribution build is not implemented yet for $(OS)"; printf "\n"
 INSTLOGFILE        = /tmp/.openThreads_inst_log
@@ -227,9 +227,7 @@
       CXX               = g++
     endif
 
-ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
-    LDFLAGS         += -Wl,-soname -Wl,$@.$(LIB_EXT).0
-endif
+    LDFLAGS         += -Wl,-soname -Wl,$@.$(LIB_EXT)
 
     ###DEF               += -fPIC
     OPTF              = -O2