summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/lib/iconv_modules/Makefile2
-rw-r--r--usr/src/lib/iconv_modules/common/Makefile2
-rw-r--r--usr/src/lib/iconv_modules/euro/Makefile2
-rw-r--r--usr/src/lib/iconv_modules/euro/Makefile.com12
-rw-r--r--usr/src/lib/iconv_modules/hi_IN/Makefile2
-rw-r--r--usr/src/lib/iconv_modules/ja/Makefile2
-rw-r--r--usr/src/lib/iconv_modules/ja/Makefile.com9
-rw-r--r--usr/src/lib/iconv_modules/ko/Makefile2
-rw-r--r--usr/src/lib/iconv_modules/th_TH/Makefile2
-rw-r--r--usr/src/lib/iconv_modules/utf-8/Makefile54
-rw-r--r--usr/src/lib/iconv_modules/utf-8/Makefile.com36
-rw-r--r--usr/src/lib/iconv_modules/utf-8/Makefile.iconv26
-rw-r--r--usr/src/lib/iconv_modules/vi/Makefile2
-rw-r--r--usr/src/lib/iconv_modules/zh/Makefile2
14 files changed, 96 insertions, 59 deletions
diff --git a/usr/src/lib/iconv_modules/Makefile b/usr/src/lib/iconv_modules/Makefile
index a881735665..e8ec6dc252 100644
--- a/usr/src/lib/iconv_modules/Makefile
+++ b/usr/src/lib/iconv_modules/Makefile
@@ -35,6 +35,8 @@ clobber := TARGET = clobber
all install lint clean clobber: $(SUBDIRS)
+.PARALLEL: $(SUBDIRS)
+
$(SUBDIRS): FRC
cd $@; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/iconv_modules/common/Makefile b/usr/src/lib/iconv_modules/common/Makefile
index da26c3adf1..eaa4f5a9f1 100644
--- a/usr/src/lib/iconv_modules/common/Makefile
+++ b/usr/src/lib/iconv_modules/common/Makefile
@@ -39,6 +39,8 @@ echo := TARGET = echo
all clean clobber install lint echo: $(SUBDIRS)
+.PARALLEL: $(SUBDIRS)
+
$(SUBDIRS): FRC
@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/iconv_modules/euro/Makefile b/usr/src/lib/iconv_modules/euro/Makefile
index da26c3adf1..eaa4f5a9f1 100644
--- a/usr/src/lib/iconv_modules/euro/Makefile
+++ b/usr/src/lib/iconv_modules/euro/Makefile
@@ -39,6 +39,8 @@ echo := TARGET = echo
all clean clobber install lint echo: $(SUBDIRS)
+.PARALLEL: $(SUBDIRS)
+
$(SUBDIRS): FRC
@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/iconv_modules/euro/Makefile.com b/usr/src/lib/iconv_modules/euro/Makefile.com
index 444be97b64..c51372dcad 100644
--- a/usr/src/lib/iconv_modules/euro/Makefile.com
+++ b/usr/src/lib/iconv_modules/euro/Makefile.com
@@ -44,18 +44,18 @@ include $(SRC)/lib/iconv_modules/Makefile.iconv
LDFLAGS = $(DYNFLAGS) $(LDLIBS)
-CFLAGS += $(INCLUDES) $(XREGSFLAG) -D_REENTRANT
+CFLAGS += $(XREGSFLAG) -D_REENTRANT
-CLEANFILES += core ../common/tbl.h
+CLEANFILES += tbl.h
-$(ALL_SOS): ../common/euro.h ../common/euro.c ../common/tbl.h
+$(ALL_SOS): ../common/euro.h ../common/euro.c tbl.h
TABLE=`echo $@ | $(TR) -d "-" | sed -e s:%:_:g | /usr/bin/cut -d. -f1` ; \
- $(CC) $(CFLAGS) -DT_$$TABLE ../common/euro.c -c -o $@.o ; \
+ $(CC) $(CFLAGS) $(CPPFLAGS) -DT_$$TABLE ../common/euro.c -c -o $@.o ; \
$(LD) $(LDFLAGS) -o $@ $@.o $(LDLIBS)
$(POST_PROCESS_SO)
-../common/tbl.h: ../genincl $(TABLES:%=../tbls/%)
- cd ..; ./genincl > common/tbl.h
+tbl.h: ../genincl $(TABLES:%=../tbls/%)
+ (cd ..; ./genincl) > $@
$(CREATE_LINKS): $(ICONV_LINK_TARGETS)
$(SYMLINK) -f 646%8859-1.so $(ICONV_DIR)/646%8859-15.so
diff --git a/usr/src/lib/iconv_modules/hi_IN/Makefile b/usr/src/lib/iconv_modules/hi_IN/Makefile
index da26c3adf1..eaa4f5a9f1 100644
--- a/usr/src/lib/iconv_modules/hi_IN/Makefile
+++ b/usr/src/lib/iconv_modules/hi_IN/Makefile
@@ -39,6 +39,8 @@ echo := TARGET = echo
all clean clobber install lint echo: $(SUBDIRS)
+.PARALLEL: $(SUBDIRS)
+
$(SUBDIRS): FRC
@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/iconv_modules/ja/Makefile b/usr/src/lib/iconv_modules/ja/Makefile
index da26c3adf1..eaa4f5a9f1 100644
--- a/usr/src/lib/iconv_modules/ja/Makefile
+++ b/usr/src/lib/iconv_modules/ja/Makefile
@@ -39,6 +39,8 @@ echo := TARGET = echo
all clean clobber install lint echo: $(SUBDIRS)
+.PARALLEL: $(SUBDIRS)
+
$(SUBDIRS): FRC
@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/iconv_modules/ja/Makefile.com b/usr/src/lib/iconv_modules/ja/Makefile.com
index a7e10f6fed..a7c1bbd205 100644
--- a/usr/src/lib/iconv_modules/ja/Makefile.com
+++ b/usr/src/lib/iconv_modules/ja/Makefile.com
@@ -312,6 +312,15 @@ CLEANFILES += $(LINKS) $(DYNOBJS) $(ALL_SOS)
clobber: clean
+# There is no way to escape the make(1S) interpretation of '%' as a wildcard,
+# as such we can't install these files using traditional make rules, given
+# they contain a % which, while it would match a literal '%' and work
+# somewhat, would also match anything else.
+#
+# We have to, rather unfortunately, loop.
+#
+# Note especially that here, unlike in utf-8/, this is not merely theoretical
+# We have both UTF-16%PCK and UTF-16BE%PCK for example.
$(INSTALL_MODULES): $(DYNOBJS)
for f in $(DYNOBJS); do \
fp=`echo $$f | $(SED) -e 's/_TO_/%/'`; \
diff --git a/usr/src/lib/iconv_modules/ko/Makefile b/usr/src/lib/iconv_modules/ko/Makefile
index da26c3adf1..eaa4f5a9f1 100644
--- a/usr/src/lib/iconv_modules/ko/Makefile
+++ b/usr/src/lib/iconv_modules/ko/Makefile
@@ -39,6 +39,8 @@ echo := TARGET = echo
all clean clobber install lint echo: $(SUBDIRS)
+.PARALLEL: $(SUBDIRS)
+
$(SUBDIRS): FRC
@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/iconv_modules/th_TH/Makefile b/usr/src/lib/iconv_modules/th_TH/Makefile
index da26c3adf1..eaa4f5a9f1 100644
--- a/usr/src/lib/iconv_modules/th_TH/Makefile
+++ b/usr/src/lib/iconv_modules/th_TH/Makefile
@@ -39,6 +39,8 @@ echo := TARGET = echo
all clean clobber install lint echo: $(SUBDIRS)
+.PARALLEL: $(SUBDIRS)
+
$(SUBDIRS): FRC
@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/iconv_modules/utf-8/Makefile b/usr/src/lib/iconv_modules/utf-8/Makefile
index da26c3adf1..edcee27320 100644
--- a/usr/src/lib/iconv_modules/utf-8/Makefile
+++ b/usr/src/lib/iconv_modules/utf-8/Makefile
@@ -28,6 +28,27 @@ include $(SRC)/Makefile.master
SUBDIRS = $(MACH)
$(BUILD64)SUBDIRS += $(MACH64)
+CODESETS = IBM-037 \
+ IBM-273 IBM-277 IBM-278 IBM-280 IBM-284 IBM-285 IBM-297 \
+ IBM-420 IBM-424 IBM-500 \
+ IBM-850 IBM-852 IBM-855 IBM-856 IBM-857 IBM-862 IBM-864 \
+ IBM-866 IBM-869 \
+ IBM-870 IBM-871 IBM-875 \
+ IBM-921 IBM-922 IBM-1025 IBM-1026 IBM-1112 \
+ IBM-1122 \
+ IBM-1140 IBM-1141 IBM-1142 IBM-1143 IBM-1144 IBM-1145 \
+ IBM-1146 IBM-1147 IBM-1148 IBM-1149
+
+INPUTFILES1 = $(CODESETS:%=%+UTF-8.src)
+INPUTFILES2 = $(CODESETS:%=UTF-8+%.src)
+INPUTFILES = $(INPUTFILES1) $(INPUTFILES2)
+BINARYTABLES = $(INPUTFILES:%.src=%.bt)
+GENICONVTBL = /usr/bin/geniconvtbl
+GENI_SRCS = common/binarytables/srcs
+ICONV_DIR = $(ROOT)/usr/lib/iconv
+BTS_DIR = $(ICONV_DIR)/geniconvtbl/binarytables
+
+
all := TARGET = all
clean := TARGET = clean
clobber := TARGET = clobber
@@ -35,10 +56,43 @@ install := TARGET = install
lint := TARGET = lint
echo := TARGET = echo
+$(ICONV_DIR)/alias:= FILEMODE=0444
+
.KEEP_STATE:
+$(BTS_DIR):
+ $(INS.dir)
+
+%.bt: $(GENI_SRCS)/%.src
+ $(GENICONVTBL) -o $@ -f $<
+
+$(ICONV_DIR)/%: %
+ $(INS.file)
+
+all: $(BINARYTABLES)
+
+# There is no way to escape the make(1S) interpretation of '%' as a wildcard,
+# as such we can't install these files using traditional make rules, given
+# they contain a % which, while it would match a literal '%' and work
+# somewhat, would also match anything else.
+#
+# We have to, rather unfortunately, loop.
+install: all $(BINARYTABLES) $(BTS_DIR) $(ICONV_DIR)/alias
+ for f in $(BINARYTABLES) ; do \
+ fp=`echo $$f | $(TR) "+" "%"` ; \
+ echo "installing $$f as $(BTS_DIR)/$$fp ..." ; \
+ $(RM) $(BTS_DIR)/$$fp ; \
+ $(CP) $$f $(BTS_DIR)/$$fp ; \
+ $(CHMOD) 0444 $(BTS_DIR)/$$fp; \
+ done
+
+clean:
+ $(RM) $(BINARYTABLES)
+
all clean clobber install lint echo: $(SUBDIRS)
+.PARALLEL: $(SUBDIRS)
+
$(SUBDIRS): FRC
@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/iconv_modules/utf-8/Makefile.com b/usr/src/lib/iconv_modules/utf-8/Makefile.com
index 2136e0ea66..73954ee7dd 100644
--- a/usr/src/lib/iconv_modules/utf-8/Makefile.com
+++ b/usr/src/lib/iconv_modules/utf-8/Makefile.com
@@ -26,35 +26,22 @@
include $(SRC)/Makefile.master
-BTS_DIR = $(ROOT)/usr/lib/iconv/geniconvtbl/binarytables
-
-# geniconvtbl loadmodule
-GENICONVTBL= /usr/bin/geniconvtbl
#
# Common sources come from following directory:
COMMON = ../common/
-GENI_SRCS = ../common/binarytables/srcs
include $(SRC)/lib/iconv_modules/Makefile.iconv
include $(SRC)/lib/iconv_modules/utf-8/Makefile.iconv
-CLEANFILES = *.o *.so core *.bt
+CLEANFILES = *.o *.so
.NO_PARALLEL:
-.PARALLEL: $(DYNOBJS) $(BINARYTABLES)
-
+.PARALLEL: $(DYNOBJS)
-all: $(DYNOBJS) $(BINARYTABLES)
+all: $(DYNOBJS)
-install: all $(ICONV_DIR) $(BTS_DIR) $(ICONV_DIR)/alias
- for f in $(BINARYTABLES) ; do \
- TMP=`echo $$f | $(TR) "+" "%"` ; \
- echo installing $$TMP to $(BTS_DIR) ; \
- $(RM) $(BTS_DIR)/$$TMP ; \
- $(CP) $$f $(BTS_DIR)/$$TMP ; \
- $(CHMOD) 444 $(BTS_DIR)/$$TMP ; \
- done
+install: all $(ICONV_DIR)
for f in $(DYNOBJS) ; do \
TMP=`echo $$f | $(TR) "+" "%"` ; \
echo installing $$TMP to $(ICONV_DIR) ; \
@@ -64,14 +51,8 @@ install: all $(ICONV_DIR) $(BTS_DIR) $(ICONV_DIR)/alias
done
-@echo "done."
-
-$(BTS_DIR):
- $(INS.dir) $@
-
clobber: clean
-$(ICONV_DIR)/alias:= FILEMODE=0444
-
LDLIBS = -lc
LDFLAGS = $(DYNFLAGS) $(LDLIBS) $(CFLAG_OPT)
@@ -248,12 +229,3 @@ $(UTF_8_TO_UTF_8_SO): $(COMMON)/common_defs.h $(COMMON)/utf8.c
$(CC) $(CFLAGS) $(COMMON)/utf8.c -c -o $@.o
$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $@.o
$(POST_PROCESS_SO)
-
-
-#
-# Rules for binary tables:
-.SUFFIXES: $(SUFFIXES) .src
-.SUFFIXES: $(SUFFIXES) .bt
-
-%.bt: $(GENI_SRCS)/%.src
- $(GENICONVTBL) -o $@ -f $<
diff --git a/usr/src/lib/iconv_modules/utf-8/Makefile.iconv b/usr/src/lib/iconv_modules/utf-8/Makefile.iconv
index bc4d8864a6..3b8feb9054 100644
--- a/usr/src/lib/iconv_modules/utf-8/Makefile.iconv
+++ b/usr/src/lib/iconv_modules/utf-8/Makefile.iconv
@@ -1393,14 +1393,14 @@ UTF_8_TO_UTF_EBCDIC = UTF-8+UTF-EBCDIC.so
#
# ACE/ACE-ALLOW-UNASSIGNED <-> UTF-8 iconv modules:
-ACE_TO_UTF_8 = ACE%UTF-8.so
-ACE_ALLOW_UNAS_TO_UTF_8 = ACE-ALLOW-UNASSIGNED%UTF-8.so
-UTF_8_TO_ACE = UTF-8%ACE.so
-UTF_8_TO_ACE_ALLOW_UNAS = UTF-8%ACE-ALLOW-UNASSIGNED.so
+ACE_TO_UTF_8 = ACE+UTF-8.so
+ACE_ALLOW_UNAS_TO_UTF_8 = ACE-ALLOW-UNASSIGNED+UTF-8.so
+UTF_8_TO_ACE = UTF-8+ACE.so
+UTF_8_TO_ACE_ALLOW_UNAS = UTF-8+ACE-ALLOW-UNASSIGNED.so
#
# UTF-8 <-> UTF-8 iconv module:
-UTF_8_TO_UTF_8 = UTF-8%UTF-8.so
+UTF_8_TO_UTF_8 = UTF-8+UTF-8.so
#
# Following are groupings:
@@ -6749,19 +6749,3 @@ UTF_8_TO_ACE_SO= $(UTF_8_TO_ACE)
UTF_8_TO_ACE_ALLOW_UNAS_SO= $(UTF_8_TO_ACE_ALLOW_UNAS)
UTF_8_TO_UTF_8_SO = $(UTF_8_TO_UTF_8)
-
-CODESETS = IBM-037 \
- IBM-273 IBM-277 IBM-278 IBM-280 IBM-284 IBM-285 IBM-297 \
- IBM-420 IBM-424 IBM-500 \
- IBM-850 IBM-852 IBM-855 IBM-856 IBM-857 IBM-862 IBM-864 \
- IBM-866 IBM-869 \
- IBM-870 IBM-871 IBM-875 \
- IBM-921 IBM-922 IBM-1025 IBM-1026 IBM-1112 \
- IBM-1122 \
- IBM-1140 IBM-1141 IBM-1142 IBM-1143 IBM-1144 IBM-1145 \
- IBM-1146 IBM-1147 IBM-1148 IBM-1149
-
-INPUTFILES1 = $(CODESETS:%=%+UTF-8.src)
-INPUTFILES2 = $(CODESETS:%=UTF-8+%.src)
-INPUTFILES = $(INPUTFILES1) $(INPUTFILES2)
-BINARYTABLES = $(INPUTFILES:%.src=%.bt)
diff --git a/usr/src/lib/iconv_modules/vi/Makefile b/usr/src/lib/iconv_modules/vi/Makefile
index da26c3adf1..eaa4f5a9f1 100644
--- a/usr/src/lib/iconv_modules/vi/Makefile
+++ b/usr/src/lib/iconv_modules/vi/Makefile
@@ -39,6 +39,8 @@ echo := TARGET = echo
all clean clobber install lint echo: $(SUBDIRS)
+.PARALLEL: $(SUBDIRS)
+
$(SUBDIRS): FRC
@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/iconv_modules/zh/Makefile b/usr/src/lib/iconv_modules/zh/Makefile
index da26c3adf1..eaa4f5a9f1 100644
--- a/usr/src/lib/iconv_modules/zh/Makefile
+++ b/usr/src/lib/iconv_modules/zh/Makefile
@@ -39,6 +39,8 @@ echo := TARGET = echo
all clean clobber install lint echo: $(SUBDIRS)
+.PARALLEL: $(SUBDIRS)
+
$(SUBDIRS): FRC
@cd $@; pwd; $(MAKE) $(TARGET)
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-21 15:48:42 +0000