backout: 11394 iconv_modules build could be much more parallel (breaks build)

12 files changed, 7 insertions, 27 deletions

diff --git a/usr/src/lib/iconv_modules/Makefile b/usr/src/lib/iconv_modules/Makefile
index e8ec6dc252..a881735665 100644
--- a/usr/src/lib/iconv_modules/Makefile
+++ b/usr/src/lib/iconv_modules/Makefile
@@ -35,8 +35,6 @@ 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 eaa4f5a9f1..da26c3adf1 100644
--- a/usr/src/lib/iconv_modules/common/Makefile
+++ b/usr/src/lib/iconv_modules/common/Makefile
@@ -39,8 +39,6 @@ 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 eaa4f5a9f1..da26c3adf1 100644
--- a/usr/src/lib/iconv_modules/euro/Makefile
+++ b/usr/src/lib/iconv_modules/euro/Makefile
@@ -39,8 +39,6 @@ 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 c51372dcad..444be97b64 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		+= $(XREGSFLAG) -D_REENTRANT
+CFLAGS		+= $(INCLUDES) $(XREGSFLAG) -D_REENTRANT
 
-CLEANFILES +=	tbl.h
+CLEANFILES +=	core ../common/tbl.h
 
-$(ALL_SOS): ../common/euro.h ../common/euro.c tbl.h
+$(ALL_SOS): ../common/euro.h ../common/euro.c ../common/tbl.h
 	TABLE=`echo $@ | $(TR) -d "-" | sed -e s:%:_:g | /usr/bin/cut -d. -f1` ; \
-	$(CC) $(CFLAGS) $(CPPFLAGS) -DT_$$TABLE ../common/euro.c -c -o $@.o ; \
+	$(CC) $(CFLAGS) -DT_$$TABLE ../common/euro.c -c -o $@.o ; \
 	$(LD) $(LDFLAGS) -o $@ $@.o $(LDLIBS)
 	$(POST_PROCESS_SO)
 
-tbl.h: ../genincl $(TABLES:%=../tbls/%)
-	(cd ..; ./genincl) > $@
+../common/tbl.h: ../genincl $(TABLES:%=../tbls/%)
+	cd ..; ./genincl > common/tbl.h
 
 $(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 eaa4f5a9f1..da26c3adf1 100644
--- a/usr/src/lib/iconv_modules/hi_IN/Makefile
+++ b/usr/src/lib/iconv_modules/hi_IN/Makefile
@@ -39,8 +39,6 @@ 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 eaa4f5a9f1..da26c3adf1 100644
--- a/usr/src/lib/iconv_modules/ja/Makefile
+++ b/usr/src/lib/iconv_modules/ja/Makefile
@@ -39,8 +39,6 @@ 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/ko/Makefile b/usr/src/lib/iconv_modules/ko/Makefile
index eaa4f5a9f1..da26c3adf1 100644
--- a/usr/src/lib/iconv_modules/ko/Makefile
+++ b/usr/src/lib/iconv_modules/ko/Makefile
@@ -39,8 +39,6 @@ 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 eaa4f5a9f1..da26c3adf1 100644
--- a/usr/src/lib/iconv_modules/th_TH/Makefile
+++ b/usr/src/lib/iconv_modules/th_TH/Makefile
@@ -39,8 +39,6 @@ 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 eaa4f5a9f1..da26c3adf1 100644
--- a/usr/src/lib/iconv_modules/utf-8/Makefile
+++ b/usr/src/lib/iconv_modules/utf-8/Makefile
@@ -39,8 +39,6 @@ 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.com b/usr/src/lib/iconv_modules/utf-8/Makefile.com
index 34e767dc71..2136e0ea66 100644
--- a/usr/src/lib/iconv_modules/utf-8/Makefile.com
+++ b/usr/src/lib/iconv_modules/utf-8/Makefile.com
@@ -38,7 +38,7 @@ GENI_SRCS		= ../common/binarytables/srcs
 include $(SRC)/lib/iconv_modules/Makefile.iconv
 include $(SRC)/lib/iconv_modules/utf-8/Makefile.iconv
 
-CLEANFILES =    *.o *.so *.bt
+CLEANFILES =    *.o *.so core *.bt
 
 .NO_PARALLEL:
 
diff --git a/usr/src/lib/iconv_modules/vi/Makefile b/usr/src/lib/iconv_modules/vi/Makefile
index eaa4f5a9f1..da26c3adf1 100644
--- a/usr/src/lib/iconv_modules/vi/Makefile
+++ b/usr/src/lib/iconv_modules/vi/Makefile
@@ -39,8 +39,6 @@ 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 eaa4f5a9f1..da26c3adf1 100644
--- a/usr/src/lib/iconv_modules/zh/Makefile
+++ b/usr/src/lib/iconv_modules/zh/Makefile
@@ -39,8 +39,6 @@ echo :=         TARGET = echo
 
 all clean clobber install lint echo: $(SUBDIRS)
 
-.PARALLEL: $(SUBDIRS)
-
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)