diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-17 08:17:50 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-17 08:17:50 +0000 |
| commit | 4cf13ffaef0a53311254fb74b2688c675969fc4e (patch) | |
| tree | dc72e7d23acf27292353f52d2c996822b4cd4130 /configure.in | |
| parent | 33ecb05d5118ec54f4b6efdd53d8f5b2f666ead8 (diff) | |
* configure.in (EXTERNAL_ENCOBJS, ENCSOS): removed.
* enc/Makefile.in (BUILTIN_ENCS): includes .c suffix.
* enc/depend: splitted from Makefile.in.
* {bcc32,win32,wince}/setup.mak (-encs-): extracts BUILTIN_ENCOBJS.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14264 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/configure.in b/configure.in index c352118fd7..7f2cb64a32 100644 --- a/configure.in +++ b/configure.in @@ -1735,39 +1735,17 @@ else fi tr -d '\015' < largefile.h > confdefs.h -test -d enc || mkdir enc BUILTIN_ENCS=["`sed -n -e '/^BUILTIN_ENCS[ ]*=/{' \ -e s/// -e :l -e '/\\\\$/N' -e 's/\\\\\\n/ /' -e 't l' -e p \ -e '}' "${srcdir}/enc/Makefile.in"`"] BUILTIN_ENCS="`echo $BUILTIN_ENCS`" -EXTERNAL_ENCS= -for e in "${srcdir}/enc"/*.c; do - e=`basename "$e" .c` - case " $BUILTIN_ENCS " in - *" $e "*) ;; - *) EXTERNAL_ENCS="$EXTERNAL_ENCS $e";; - esac -done -echo $EX BUILTIN_ENCOBJS= -for e in $BUILTIN_ENCS; do BUILTIN_ENCOBJS="$BUILTIN_ENCOBJS $e"'.$(OBJEXT)'; done -EXTERNAL_ENCOBJS= -for e in $EXTERNAL_ENCS; do EXTERNAL_ENCOBJS="$EXTERNAL_ENCOBJS $e"'.$(OBJEXT)'; done -ENCSOS= -for e in $EXTERNAL_ENCS; do ENCSOS="$ENCSOS "'$(ENCSODIR)/'"$e"'.$(DLEXT)'; done +for e in $BUILTIN_ENCS; do BUILTIN_ENCOBJS="$BUILTIN_ENCOBJS `basename $e .c`"'.$(OBJEXT)'; done +AC_SUBST(BUILTIN_ENCS) AC_SUBST(BUILTIN_ENCOBJS) -AC_SUBST(EXTERNAL_ENCOBJS) -AC_SUBST(ENCSOS) AC_CONFIG_FILES($FIRSTMAKEFILE) -AC_CONFIG_FILES(enc/Makefile, [{ - for e in $ENCS; do - echo '' - echo '$(ENCSODIR)/'"$e"'.$(DLEXT): '"$e"'.$(OBJEXT)' - echo ' $(LDSHARED) $(DLDFLAGS) $< $(OUTFLAG)$''@' - done >> enc/Makefile -}], [ENCS="$EXTERNAL_ENCS"]) AC_CONFIG_FILES(Makefile, [{ sed '/^MISSING/s/\$U\././g' Makefile echo; test x"$EXEEXT" = x || echo 'miniruby: miniruby$(EXEEXT)' |