Convert to new X11 requirements (libs built with -shared).
Should fix xview (which is completely broken right now anyway), build in progress...
This commit is contained in:
parent
e92ef35e67
commit
54682acca9
@ -1,6 +1,6 @@
|
||||
--- config/XView.rules.orig Tue Jun 29 07:13:20 1993
|
||||
+++ config/XView.rules Sun Apr 2 04:34:04 2000
|
||||
@@ -83,8 +83,8 @@
|
||||
+++ config/XView.rules Sun Oct 22 19:34:23 2000
|
||||
@@ -83,8 +83,8 @@ name:: @@\
|
||||
#ifndef InstallLibraryNoBuild
|
||||
#define InstallLibraryNoBuild(libname,dest) @@\
|
||||
install:: @@\
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
#endif /* InstallLibraryNoBuild */
|
||||
|
||||
@@ -93,7 +93,7 @@
|
||||
@@ -93,7 +93,7 @@ install:: @@\
|
||||
#ifndef InstallLibraryNoBuild
|
||||
#define InstallLibraryNoBuild(libname,dest) @@\
|
||||
install:: @@\
|
||||
@ -20,7 +20,26 @@
|
||||
#endif /* InstallLibraryNoBuild */
|
||||
|
||||
#endif /* DoRanlibCmd */
|
||||
@@ -343,8 +343,8 @@
|
||||
@@ -148,7 +148,7 @@ lib/**/libname.so.rev:: solist @@\
|
||||
$(RM) $@~ sodir/lib/**/libname.so.xs.o @@\
|
||||
@if [ -f xstrings ]; then \ @@\
|
||||
$(RM) strings; $(CP) xstrings strings; fi @@\
|
||||
- (cd sodir; $(LD) -o ../$@~ $(SHLIBLDFLAGS) ?*.o) @@\
|
||||
+ (cd sodir; $(CC) -o ../$@~ -Wl,-soname,$@ $(SHLIBLDFLAGS) ?*.o) @@\
|
||||
-@if [ -f strings~ ]; then $(RM) strings~; else exit 0; fi @@\
|
||||
$(RM) $@ @@\
|
||||
$(MV) $@~ $@ @@\
|
||||
@@ -175,7 +175,8 @@ lib/**/libname.so.rev:: solist @@\
|
||||
@if [ -f xstrings ]; then \ @@\
|
||||
$(RM) strings; $(CP) xstrings strings; fi @@\
|
||||
-@if [ ! -x objsort ];then $(CHMOD) 755 objsort;else exit 0;fi @@\
|
||||
- $(LD) `objsort objlist sodir` -o $@~ $(SHLIBLDFLAGS) @@\
|
||||
+ $(CC) `objsort objlist sodir` -o $@~ -Wl,-soname,$@\ @@\
|
||||
+ $(SHLIBLDFLAGS) @@\
|
||||
@if [ -f strings~ ]; then $(RM) strings~; else exit 0; fi @@\
|
||||
$(RM) $@ @@\
|
||||
$(MV) $@~ $@ @@\
|
||||
@@ -343,8 +344,8 @@ objs: depends @@\
|
||||
#ifndef InstallSharedLibraryDataNoBuild
|
||||
#define InstallSharedLibraryDataNoBuild(libname,rev,dest) @@\
|
||||
install:: @@\
|
||||
@ -31,7 +50,7 @@
|
||||
|
||||
|
||||
#endif /* InstallSharedLibraryDataNoBuild */
|
||||
@@ -354,7 +354,7 @@
|
||||
@@ -354,7 +355,7 @@ install:: @@\
|
||||
#ifndef InstallSharedLibraryDataNoBuild
|
||||
#define InstallSharedLibraryDataNoBuild(libname,rev,dest) @@\
|
||||
install:: @@\
|
||||
@ -40,7 +59,7 @@
|
||||
|
||||
#endif /* InstallSharedLibraryDataNoBuild */
|
||||
|
||||
@@ -366,9 +366,9 @@
|
||||
@@ -366,9 +367,9 @@ install:: @@\
|
||||
#ifndef InstallSharedLibraryNoBuild
|
||||
#define InstallSharedLibraryNoBuild(libname,rev,dest) @@\
|
||||
install:: @@\
|
||||
@ -53,7 +72,7 @@
|
||||
|
||||
#endif /* InstallSharedLibraryNoBuild */
|
||||
|
||||
@@ -475,9 +475,9 @@
|
||||
@@ -475,9 +476,9 @@ install:: @@\
|
||||
for i in srcs ;\ @@\
|
||||
do \ @@\
|
||||
echo "installing $$i"; \ @@\
|
||||
@ -66,7 +85,7 @@
|
||||
done
|
||||
#endif /* InstallSupportList */
|
||||
|
||||
@@ -491,8 +491,8 @@
|
||||
@@ -491,8 +492,8 @@ install:: @@\
|
||||
for i in srcs ;\ @@\
|
||||
do \ @@\
|
||||
echo "installing $$i"; \ @@\
|
||||
@ -77,7 +96,7 @@
|
||||
done
|
||||
#endif /* InstallNonExecList */
|
||||
|
||||
@@ -506,11 +506,11 @@
|
||||
@@ -506,11 +507,11 @@ install.srcs:: @@\
|
||||
for i in files ;\ @@\
|
||||
do \ @@\
|
||||
echo "installing $$i"; \ @@\
|
||||
@ -93,7 +112,7 @@
|
||||
#endif /* InstallExampleSrcs */
|
||||
|
||||
/*
|
||||
@@ -524,8 +524,8 @@
|
||||
@@ -524,8 +525,8 @@ install.srcs:: @@\
|
||||
for i in files ;\ @@\
|
||||
do \ @@\
|
||||
echo "installing $$i"; \ @@\
|
||||
|
Loading…
Reference in New Issue
Block a user