summary refs log tree commit diff
path: root/iconvdata
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-06-20 07:10:50 +0000
committerUlrich Drepper <drepper@redhat.com>2001-06-20 07:10:50 +0000
commitad10cac8a4d5874f6e7cd8cd6b4acbf86502a893 (patch)
tree55851a6afc1be5d786fce886daf3a528ba7a41f7 /iconvdata
parent874e557059c1dfb945437826f477ed43b31871c7 (diff)
downloadglibc-ad10cac8a4d5874f6e7cd8cd6b4acbf86502a893.tar.gz
glibc-ad10cac8a4d5874f6e7cd8cd6b4acbf86502a893.tar.xz
glibc-ad10cac8a4d5874f6e7cd8cd6b4acbf86502a893.zip
Update.
2001-05-09  Michael Keezer  <mkeezer@redhat.com>

	* Makeconfig: Added AIX-ld support for DSO.
	* Makerules: Likewise.
	* dlfcn/Makefile (defaultmod1.so): Added libc_nonshared.
	(defaultmod2.so): Likewise.
	* debug/Makefile: Conditionalize use of elf/ld.so.
	* iconvdata/Makefile: Moved LDFLAG rpath/soname info into Makeconfig.

	* sysdeps/unix/sysv/aix/Makefile: Added dl-support.c and dl-error.c.
	* sysdeps/unix/sysv/aix/Makefile: Made (f/g)rsave(0/1) &
	(f/g)prrest(0/1) static only.
	* sysdeps/unix/sysv/aix/gettimeofday.c: Removed #if 0.
	* sysdeps/unix/sysv/aix/start.c: Define __dso_handle if not ELF but
	shared.
	* sysdeps/unix/sysv/aix/setitimer.c: New file.
	* sysdeps/unix/sysv/aix/sleep.c: New file.
	* sysdeps/unix/sysv/aix/usleep.c: New file.
	* sysdeps/unix/sysv/aix/dl-addr.c: New file.
	* sysdeps/unix/sysv/aix/dl-error.c: New file.
	* sysdeps/unix/sysv/aix/dl-support.c: New file.
	* sysdeps/unix/sysv/aix/powerpc/register-dump.h: New file.

	(BODY for TO_LOOP): Keep track of Unicode 3.1 language tag. I f "ja",
	prefer conversion to Japanese character sets.  If "zh", prefer
	conversion to GB2312. I f "ko", prefer conversion to KSC5601.  Small
Diffstat (limited to 'iconvdata')
-rw-r--r--iconvdata/Makefile30
1 files changed, 15 insertions, 15 deletions
diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index ce1a87930c..7faa9c8c6a 100644
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -63,35 +63,35 @@ libGB-routines := gb2312
 libCNS-routines := cns11643l1 cns11643
 libISOIR165-routines := iso-ir-165
 
-LDFLAGS-EUC-KR.so = -Wl,-rpath,'$$ORIGIN'
+LDFLAGS-EUC-KR.so = $(LDFLAGS-rpath-ORIGIN)
 $(objpfx)EUC-KR.so: $(objpfx)libKSC.so
-LDFLAGS-JOHAB.so = -Wl,-rpath,'$$ORIGIN'
+LDFLAGS-JOHAB.so = $(LDFLAGS-rpath-ORIGIN)
 $(objpfx)JOHAB.so: $(objpfx)libKSC.so
-LDFLAGS-UHC.so = -Wl,-rpath,'$$ORIGIN'
+LDFLAGS-UHC.so = $(LDFLAGS-rpath-ORIGIN)
 $(objpfx)UHC.so: $(objpfx)libKSC.so
-LDFLAGS-EUC-JP.so = -Wl,-rpath,'$$ORIGIN'
+LDFLAGS-EUC-JP.so = $(LDFLAGS-rpath-ORIGIN)
 $(objpfx)EUC-JP.so: $(objpfx)libJIS.so
-LDFLAGS-EUC-CN.so = -Wl,-rpath,'$$ORIGIN'
+LDFLAGS-EUC-CN.so = $(LDFLAGS-rpath-ORIGIN)
 $(objpfx)EUC-CN.so: $(objpfx)libGB.so
-LDFLAGS-EUC-TW.so = -Wl,-rpath,'$$ORIGIN'
+LDFLAGS-EUC-TW.so = $(LDFLAGS-rpath-ORIGIN)
 $(objpfx)EUC-TW.so: $(objpfx)libCNS.so
 
-LDFLAGS-ISO-2022-JP.so = -Wl,-rpath,'$$ORIGIN'
+LDFLAGS-ISO-2022-JP.so = $(LDFLAGS-rpath-ORIGIN)
 $(objpfx)ISO-2022-JP.so: $(objpfx)libJIS.so $(objpfx)libGB.so \
 			 $(objpfx)libCNS.so $(objpfx)libKSC.so
-LDFLAGS-ISO-2022-KR.so = -Wl,-rpath,'$$ORIGIN'
+LDFLAGS-ISO-2022-KR.so = $(LDFLAGS-rpath-ORIGIN)
 $(objpfx)ISO-2022-KR.so: $(objpfx)libKSC.so
-LDFLAGS-ISO-2022-CN.so = -Wl,-rpath,'$$ORIGIN'
+LDFLAGS-ISO-2022-CN.so = $(LDFLAGS-rpath-ORIGIN)
 $(objpfx)ISO-2022-CN.so: $(objpfx)libGB.so $(objpfx)libCNS.so
-LDFLAGS-ISO-2022-CN-EXT.so = -Wl,-rpath,'$$ORIGIN'
+LDFLAGS-ISO-2022-CN-EXT.so = $(LDFLAGS-rpath-ORIGIN)
 $(objpfx)ISO-2022-CN-EXT.so: $(objpfx)libGB.so $(objpfx)libCNS.so \
 			     $(objpfx)libISOIR165.so
 
-LDFLAGS-libJIS.so = -Wl,-soname,$(@F)
-LDFLAGS-libKSC.so = -Wl,-soname,$(@F)
-LDFLAGS-libGB.so = -Wl,-soname,$(@F)
-LDFLAGS-libCNS.so = -Wl,-soname,$(@F)
-LDFLAGS-libISOIR165.so = -Wl,-soname,$(@F)
+LDFLAGS-libJIS.so = $(LDFLAGS-soname-fname)
+LDFLAGS-libKSC.so = $(LDFLAGS-soname-fname)
+LDFLAGS-libGB.so = $(LDFLAGS-soname-fname)
+LDFLAGS-libCNS.so = $(LDFLAGS-soname-fname)
+LDFLAGS-libISOIR165.so = $(LDFLAGS-soname-fname)
 
 distribute := gconv-modules extra-module.mk gap.awk gaptab.awk		    \
 	      gen-8bit.sh gen-8bit-gap.sh gen-8bit-gap-1.sh		    \