File pwlib-1.10.10-make.diff of Package pwlib

File pwlib-1.10.10-make.diff of Package pwlib (Revision e4733cf8737c955a6d911314d3150ace)

Currently displaying revision e4733cf8737c955a6d911314d3150ace, show latest

Index: pwlib-1.10.7/make/gui.mak
===================================================================
--- pwlib-1.10.7.orig/make/gui.mak
+++ pwlib-1.10.7/make/gui.mak
@@ -86,7 +86,7 @@ STDCCFLAGS      += -I$(GUI_INC_DIR)
 #
 # add GUI library
 #
-LDLIBS          += -l$(PWLIB_BASE)$(LIB_TYPE) 
+LDLIBS          += -l$(PWLIB_BASE)
 ifdef	GUILIB
 LDLIBS          += $(GUILIB)
 endif
Index: pwlib-1.10.7/make/unix.mak
===================================================================
--- pwlib-1.10.7.orig/make/unix.mak
+++ pwlib-1.10.7/make/unix.mak
@@ -939,14 +939,14 @@ endif
 PW_LIBDIR	= $(PWLIBDIR)/lib
 
 # set name of the PT library
-PTLIB_BASE	= pt_$(PLATFORM_TYPE)_$(OBJ_SUFFIX)
-PTLIB_FILE	= lib$(PTLIB_BASE)$(LIB_TYPE).$(LIB_SUFFIX)
+PTLIB_BASE	= pt
+PTLIB_FILE	= lib$(PTLIB_BASE).$(LIB_SUFFIX)
 PT_OBJBASE	= obj_$(PLATFORM_TYPE)_$(OBJDIR_SUFFIX)
 PT_OBJDIR	= $(PW_LIBDIR)/$(PT_OBJBASE)
 
 # set name of the PW library (may not be used)
-PWLIB_BASE	= pw_$(GUI_TYPE)_$(PLATFORM_TYPE)_$(OBJ_SUFFIX)
-PWLIB_FILE	= lib$(PWLIB_BASE)$(LIB_TYPE).$(LIB_SUFFIX)
+PWLIB_BASE	= pw
+PWLIB_FILE	= lib$(PWLIB_BASE).$(LIB_SUFFIX)
 PW_OBJBASE	= obj_$(GUI_TYPE)_$(PLATFORM_TYPE)_$(OBJDIR_SUFFIX)
 PW_OBJDIR	= $(PW_LIBDIR)/$(PW_OBJBASE)
 
@@ -1004,6 +1004,6 @@ endif
 # add library directory to library path and include the library
 LDFLAGS		+= -L$(PW_LIBDIR)
 
-LDLIBS		+= -l$(PTLIB_BASE)$(LIB_TYPE)
+LDLIBS		+= -l$(PTLIB_BASE)
 
 # End of unix.mak
Index: pwlib-1.10.7/Makefile.in
===================================================================
--- pwlib-1.10.7.orig/Makefile.in
+++ pwlib-1.10.7/Makefile.in
@@ -267,10 +267,6 @@ install:
 		rm -f  $(PTLIB_FILE) ; \
 		ln -sf $(PTLIB_FILE).@MAJOR_VERSION@.@MINOR_VERSION@.@BUILD_NUMBER@ $(PTLIB_FILE) \
 	)
-	(cd $(DESTDIR)$(LIBDIR); \
-		rm -f  libpt.@SHAREDLIBEXT@ ; \
-		ln -sf $(PTLIB_FILE) libpt.@SHAREDLIBEXT@ \
-	)
 ifeq (1, $(HAS_PLUGINS))
 	cd plugins/pwlib/device/ ; \
 	( for dir in ./* ;\
Index: pwlib-1.10.7/make/lib.mak
===================================================================
--- pwlib-1.10.7.orig/make/lib.mak
+++ pwlib-1.10.7/make/lib.mak
@@ -144,7 +144,7 @@ else
   endif
 endif
 
-LIB_SONAME	= $(LIBNAME_PAT)
+LIB_SONAME	= $(LIBNAME_MIN)
 
 CLEAN_FILES += $(LIBDIR)/$(LIBNAME_PAT) $(LIBDIR)/$(LIB_FILENAME) $(LIBDIR)/$(LIBNAME_MAJ) $(LIBDIR)/$(LIBNAME_MIN)