Commit 45d5f86c by Andrew Pinski Committed by Andrew Pinski

Makefile.in: Replace all uses of libext with libsuffix.

2007-06-01  Andrew Pinski  <andrew_pinski@playstation.sony.com>

        * Makefile.in: Replace all uses of libext with libsuffix.
        * configure.ac: Likewise.
        * configure: Regenerate.

        Revert:
        * Makefile.in: Remove all uses of $(libext).

From-SVN: r125275
parent 69410585
2007-06-01 Andrew Pinski <andrew_pinski@playstation.sony.com>
* Makefile.in: Replace all uses of libext with libsuffix.
* configure.ac: Likewise.
* configure: Regenerate.
Revert:
* Makefile.in: Remove all uses of $(libext).
2007-05-23 Andrew Pinski <andrew_pinski@playstation.sony.com> 2007-05-23 Andrew Pinski <andrew_pinski@playstation.sony.com>
* Makefile.in: Remove all uses of $(libext). * Makefile.in: Remove all uses of $(libext).
......
...@@ -42,6 +42,7 @@ toolexecdir = @toolexecdir@ ...@@ -42,6 +42,7 @@ toolexecdir = @toolexecdir@
toolexeclibdir = @toolexeclibdir@ toolexeclibdir = @toolexeclibdir@
includedirname = @includedirname@ includedirname = @includedirname@
libsuffix = @libsuffix@
extra_ldflags_libobjc = @extra_ldflags_libobjc@ extra_ldflags_libobjc = @extra_ldflags_libobjc@
...@@ -136,7 +137,7 @@ FLAGS_TO_PASS = \ ...@@ -136,7 +137,7 @@ FLAGS_TO_PASS = \
"libsubdir=$(libsubdir)" \ "libsubdir=$(libsubdir)" \
"tooldir=$(tooldir)" "tooldir=$(tooldir)"
all: libobjc.la $(OBJC_BOEHM_GC) all: libobjc$(libsuffix).la $(OBJC_BOEHM_GC)
: $(MAKE) ; exec $(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=all : $(MAKE) ; exec $(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=all
# User-visible header files. # User-visible header files.
...@@ -273,12 +274,12 @@ doc: info dvi pdf html ...@@ -273,12 +274,12 @@ doc: info dvi pdf html
install-html: install-html:
install-pdf: install-pdf:
libobjc.la: $(OBJS) libobjc$(libsuffix).la: $(OBJS)
$(LIBTOOL_LINK) $(CC) -o $@ $(OBJS) \ $(LIBTOOL_LINK) $(CC) -o $@ $(OBJS) \
-rpath $(toolexeclibdir) \ -rpath $(toolexeclibdir) \
-version-info $(LIBOBJC_VERSION) $(extra_ldflags_libobjc) -version-info $(LIBOBJC_VERSION) $(extra_ldflags_libobjc)
libobjc_gc.la: $(OBJS_GC) libobjc_gc$(libsuffix).la: $(OBJS_GC)
$(LIBTOOL_LINK) $(CC) -o $@ $(OBJS_GC) \ $(LIBTOOL_LINK) $(CC) -o $@ $(OBJS_GC) \
-rpath $(toolexeclibdir) \ -rpath $(toolexeclibdir) \
-version-info $(LIBOBJC_GC_VERSION) $(extra_ldflags_libobjc) -version-info $(LIBOBJC_GC_VERSION) $(extra_ldflags_libobjc)
...@@ -333,9 +334,9 @@ install: install-libs install-headers ...@@ -333,9 +334,9 @@ install: install-libs install-headers
install-libs: installdirs install-libs: installdirs
$(SHELL) $(multi_basedir)/mkinstalldirs $(DESTDIR)$(toolexeclibdir) $(SHELL) $(multi_basedir)/mkinstalldirs $(DESTDIR)$(toolexeclibdir)
$(LIBTOOL_INSTALL) $(INSTALL) libobjc.la $(DESTDIR)$(toolexeclibdir); $(LIBTOOL_INSTALL) $(INSTALL) libobjc$(libsuffix).la $(DESTDIR)$(toolexeclibdir);
if [ "$(OBJC_BOEHM_GC)" ]; then \ if [ "$(OBJC_BOEHM_GC)" ]; then \
$(LIBTOOL_INSTALL) $(INSTALL) libobjc_gc.la \ $(LIBTOOL_INSTALL) $(INSTALL) libobjc_gc$(libsuffix).la \
$(DESTDIR)$(toolexeclibdir);\ $(DESTDIR)$(toolexeclibdir);\
fi fi
$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO="$@" $(MULTIDO) $(FLAGS_TO_PASS) multi-do DO="$@"
...@@ -352,7 +353,7 @@ install-headers: ...@@ -352,7 +353,7 @@ install-headers:
check uninstall install-strip dist installcheck installdirs: check uninstall install-strip dist installcheck installdirs:
mostlyclean: mostlyclean:
-$(LIBTOOL_CLEAN) rm -f libobjc.la libobjc_gc.la *.lo -$(LIBTOOL_CLEAN) rm -f libobjc$(libsuffix).la libobjc_gc$(libsuffix).la *.lo
-rm -f runtime-info.h tmp-runtime.s *.o *.lo libobjc* xforward \ -rm -f runtime-info.h tmp-runtime.s *.o *.lo libobjc* xforward \
fflags *.aux *.cp *.dvi *.pdf *.fn *.info *.ky *.log *.pg \ fflags *.aux *.cp *.dvi *.pdf *.fn *.info *.ky *.log *.pg \
*.toc *.tp *.vr *.html libobj.exp *.toc *.tp *.vr *.html libobj.exp
......
...@@ -129,16 +129,16 @@ AC_SUBST(toolexeclibdir) ...@@ -129,16 +129,16 @@ AC_SUBST(toolexeclibdir)
# Figure out if we want to name the include directory and the # Figure out if we want to name the include directory and the
# library name changes differently. # library name changes differently.
includedirname=include includedirname=include
libext= libsuffix=
case "${host}" in case "${host}" in
*-darwin*) *-darwin*)
# Darwin is the only target so far that needs a different include directory. # Darwin is the only target so far that needs a different include directory.
includedirname=include-gnu-runtime includedirname=include-gnu-runtime
libext=-gnu libsubfix=-gnu
;; ;;
esac esac
AC_SUBST(includedirname) AC_SUBST(includedirname)
AC_SUBST(libext) AC_SUBST(libsubfix)
AC_CONFIG_HEADERS(config.h) AC_CONFIG_HEADERS(config.h)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment