Sophie

Sophie

distrib > Fedora > 15 > i386 > by-pkgid > 844397e1ea044885079a10918c88c1a3 > files > 4

libsx-2.05-19.fc15.src.rpm

diff -up libsx-2.05/src/Makefile.link_mkdir libsx-2.05/src/Makefile
--- libsx-2.05/src/Makefile.link_mkdir	2003-08-09 13:17:23.000000000 +0200
+++ libsx-2.05/src/Makefile	2007-12-27 09:39:41.000000000 +0100
@@ -13,6 +13,11 @@ LIBDIR=/usr/X11R6/lib
 INCLUDEDIR=/usr/X11R6/include/X11/SX
 SHAREDIR=/usr/share/libsx
 
+mkinstalldirs = mkdir -p
+#mkinstalldirs = mkdirhier
+
+copyfile = cp -f
+
 CC=gcc
 
 #
@@ -38,10 +43,10 @@ libsx.a : $(LIBSXOBJS)
 
 libsx.so : $(LIBSXOBJS)
 	rm -f libsx.so
-	$(CC) -shared -Wl,-soname,libsx.so draw.o toggle.o \
+	$(CC) -shared -Wl,-soname,libsx.so.0 draw.o toggle.o \
 	button.o string_entry.o libsx.o misc.o list.o font.o scrollbar.o \
 	menu.o popups.o colormap.o drawing.o dialog.o dirlist.o freq.o \
-	grabpix.o colorsel.o version.o -o libsx.so
+	grabpix.o colorsel.o version.o -o libsx.so $(XLIBS)
 
 draw.o : draw.c libsx.h libsx_private.h
 
@@ -89,12 +94,12 @@ main.o : main.c main.h libsx.h callbacks
 callbacks.o : libsx.h callbacks.c
 
 install:
-	mkdirhier $(LIBDIR)
-	cp -f libsx.a libsx.so $(LIBDIR)
-	mkdirhier $(INCLUDEDIR)
-	cp -f libsx.h $(INCLUDEDIR)
-	mkdirhier $(SHAREDIR)
-	cp -f dialogs/dialogs* $(SHAREDIR)
+	$(mkinstalldirs) $(LIBDIR)
+	$(copyfile) libsx.a libsx.so $(LIBDIR)
+	$(mkinstalldirs) $(INCLUDEDIR)
+	$(copyfile) -f libsx.h $(INCLUDEDIR)
+	$(mkinstalldirs) $(SHAREDIR)
+	$(copyfile) dialogs/dialogs* $(SHAREDIR)
 
 clean:
 	rm -f *.o *~ dialogs/*~ core libsx.a libsx.so
diff -up libsx-2.05/libsx_defs.link_mkdir libsx-2.05/libsx_defs
--- libsx-2.05/libsx_defs.link_mkdir	1999-12-14 13:59:35.000000000 +0100
+++ libsx-2.05/libsx_defs	2007-12-27 09:31:42.000000000 +0100
@@ -44,7 +44,7 @@ CC     = gcc
 #  CFLAGS = -O3 -D_POSIX_SOURCE
 #
 # On Linux, use CC=cc, RANLIB=ranlib, and:
-CFLAGS = -Wall -O2 -D_POSIX_SOURCE
+CFLAGS = -Wall -g -O2 -D_POSIX_SOURCE
 #  
 # On a Motorola Delta/88K box, you can use (with gcc):
 #  CFLAGS = -O2 -DSYSV -DUSG -DMOTOROLA -DMOTOR32V2
@@ -98,9 +98,11 @@ endif
 #
 
 #LIBSX  = ../src/libsx.a
-LIBSX = -lsx -L/usr/X11R6/lib
+LIBSX = -L../src -lsx
+
+XLIBS = -lXpm -l$(XAWLIB) -lXmu -lXt -lX11
 
 XPM_SUPPORT = yes
 
-LIBS   =  $(LIBSX) -lXpm -l$(XAWLIB) -lXmu -lXt -lX11 -L/usr/X11R6/lib
+LIBS   =  $(LIBSX) $(XLIBS)