re PR libobjc/11572 (GNU libobjc no longer compiled on Darwin)
2004-05-25 Andrew Pinski <pinskia@physics.uc.edu> PR target/11572 * configure.ac (includedir): Set to "include" except for Darwin. (libext) Set to empty except for Darwin. * configure: Regenerate * Makefile.in: s/libobjc.la/libobjc$(libext).la/g. s/include/$(includedir)/g. From-SVN: r82266
This commit is contained in:
parent
b31ad63745
commit
ff65de76d0
|
@ -1,3 +1,13 @@
|
||||||
|
2004-05-25 Andrew Pinski <pinskia@physics.uc.edu>
|
||||||
|
|
||||||
|
PR target/11572
|
||||||
|
* configure.ac (includedir): Set to "include"
|
||||||
|
except for Darwin.
|
||||||
|
(libext) Set to empty except for Darwin.
|
||||||
|
* configure: Regenerate
|
||||||
|
* Makefile.in: s/libobjc.la/libobjc$(libext).la/g.
|
||||||
|
s/include/$(includedir)/g.
|
||||||
|
|
||||||
2004-05-25 Daniel Jacobowitz <drow@false.org>
|
2004-05-25 Daniel Jacobowitz <drow@false.org>
|
||||||
|
|
||||||
* Makefile.in: Add .NOEXPORT.
|
* Makefile.in: Add .NOEXPORT.
|
||||||
|
|
|
@ -40,6 +40,9 @@ toolexecdir = @toolexecdir@
|
||||||
# Toolexecdir is used only by toolexeclibdir
|
# Toolexecdir is used only by toolexeclibdir
|
||||||
toolexeclibdir = @toolexeclibdir@
|
toolexeclibdir = @toolexeclibdir@
|
||||||
|
|
||||||
|
includedir = @includedir@
|
||||||
|
libext = @libext@
|
||||||
|
|
||||||
top_builddir = .
|
top_builddir = .
|
||||||
|
|
||||||
libdir = $(exec_prefix)/lib
|
libdir = $(exec_prefix)/lib
|
||||||
|
@ -128,7 +131,7 @@ FLAGS_TO_PASS = \
|
||||||
"libsubdir=$(libsubdir)" \
|
"libsubdir=$(libsubdir)" \
|
||||||
"tooldir=$(tooldir)"
|
"tooldir=$(tooldir)"
|
||||||
|
|
||||||
all: libobjc.la $(OBJC_BOEHM_GC)
|
all: libobjc$(libext).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.
|
||||||
|
@ -252,12 +255,12 @@ $(OBJC_THREAD_FILE)_gc.lo: $(OBJC_THREAD_FILE).c
|
||||||
|
|
||||||
doc: info dvi html
|
doc: info dvi html
|
||||||
|
|
||||||
libobjc.la: $(OBJS)
|
libobjc$(libext).la: $(OBJS)
|
||||||
$(LIBTOOL_LINK) $(CC) -o $@ $(OBJS) \
|
$(LIBTOOL_LINK) $(CC) -o $@ $(OBJS) \
|
||||||
-rpath $(toolexeclibdir) \
|
-rpath $(toolexeclibdir) \
|
||||||
-version-info $(LIBOBJC_VERSION)
|
-version-info $(LIBOBJC_VERSION)
|
||||||
|
|
||||||
libobjc_gc.la: $(OBJS_GC)
|
libobjc_gc$(libext).la: $(OBJS_GC)
|
||||||
$(LIBTOOL_LINK) $(CC) -o $@ $(OBJS_GC) \
|
$(LIBTOOL_LINK) $(CC) -o $@ $(OBJS_GC) \
|
||||||
-rpath $(toolexeclibdir) \
|
-rpath $(toolexeclibdir) \
|
||||||
-version-info $(LIBOBJC_GC_VERSION)
|
-version-info $(LIBOBJC_GC_VERSION)
|
||||||
|
@ -311,9 +314,9 @@ install: install-libs install-headers
|
||||||
|
|
||||||
install-libs: installdirs
|
install-libs: installdirs
|
||||||
$(SHELL) $(toplevel_srcdir)/mkinstalldirs $(DESTDIR)$(toolexeclibdir)
|
$(SHELL) $(toplevel_srcdir)/mkinstalldirs $(DESTDIR)$(toolexeclibdir)
|
||||||
$(LIBTOOL_INSTALL) $(INSTALL) libobjc.la $(DESTDIR)$(toolexeclibdir);
|
$(LIBTOOL_INSTALL) $(INSTALL) libobjc$(libext).la $(DESTDIR)$(toolexeclibdir);
|
||||||
if [ "$(OBJC_BOEHM_GC)" ]; then \
|
if [ "$(OBJC_BOEHM_GC)" ]; then \
|
||||||
$(LIBTOOL_INSTALL) $(INSTALL) libobjc_gc.la \
|
$(LIBTOOL_INSTALL) $(INSTALL) libobjc_gc$(libext).la \
|
||||||
$(DESTDIR)$(toolexeclibdir);\
|
$(DESTDIR)$(toolexeclibdir);\
|
||||||
fi
|
fi
|
||||||
$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO="$@"
|
$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO="$@"
|
||||||
|
@ -321,16 +324,16 @@ install-libs: installdirs
|
||||||
|
|
||||||
# Copy Objective C headers to installation include directory.
|
# Copy Objective C headers to installation include directory.
|
||||||
install-headers:
|
install-headers:
|
||||||
$(SHELL) $(toplevel_srcdir)/mkinstalldirs $(DESTDIR)$(libsubdir)/include/objc
|
$(SHELL) $(toplevel_srcdir)/mkinstalldirs $(DESTDIR)$(libsubdir)/$(includedir)/objc
|
||||||
for file in $(OBJC_H); do \
|
for file in $(OBJC_H); do \
|
||||||
realfile=$(srcdir)/objc/$${file}; \
|
realfile=$(srcdir)/objc/$${file}; \
|
||||||
$(INSTALL_DATA) $${realfile} $(DESTDIR)$(libsubdir)/include/objc; \
|
$(INSTALL_DATA) $${realfile} $(DESTDIR)$(libsubdir)/$(includedir)/objc; \
|
||||||
done
|
done
|
||||||
|
|
||||||
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$(libext).la libobjc_gc$(libext).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 *.fn *.info *.ky *.log *.pg \
|
fflags *.aux *.cp *.dvi *.fn *.info *.ky *.log *.pg \
|
||||||
*.toc *.tp *.vr *.html libobj.exp
|
*.toc *.tp *.vr *.html libobj.exp
|
||||||
|
|
|
@ -309,7 +309,7 @@ ac_includes_default="\
|
||||||
# include <unistd.h>
|
# include <unistd.h>
|
||||||
#endif"
|
#endif"
|
||||||
|
|
||||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS VERSION OBJC_BOEHM_GC toplevel_srcdir build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical glibcpp_srcdir gcc_version toolexecdir toolexeclibdir CC ac_ct_CC EXEEXT OBJEXT CFLAGS AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S STRIP ac_ct_STRIP LIBTOOL SET_MAKE CPP CPPFLAGS EGREP GTHREAD_FLAGS LIBOBJS LTLIBOBJS'
|
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS VERSION OBJC_BOEHM_GC toplevel_srcdir build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical glibcpp_srcdir gcc_version toolexecdir toolexeclibdir libext CC ac_ct_CC EXEEXT OBJEXT CFLAGS AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S STRIP ac_ct_STRIP LIBTOOL SET_MAKE CPP CPPFLAGS EGREP GTHREAD_FLAGS LIBOBJS LTLIBOBJS'
|
||||||
ac_subst_files=''
|
ac_subst_files=''
|
||||||
|
|
||||||
# Initialize some variables set by options.
|
# Initialize some variables set by options.
|
||||||
|
@ -1570,6 +1570,20 @@ esac
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# Figure out if we want to name the include directory and the
|
||||||
|
# library name changes differently.
|
||||||
|
includedir=include
|
||||||
|
libext=
|
||||||
|
case "${host}" in
|
||||||
|
*-darwin*)
|
||||||
|
# Darwin is the only target so far that needs a different include directory.
|
||||||
|
includedir=gnu-runtime;
|
||||||
|
libext=-gnu
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# --------
|
# --------
|
||||||
# Programs
|
# Programs
|
||||||
# --------
|
# --------
|
||||||
|
@ -3613,7 +3627,7 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
|
||||||
case $host in
|
case $host in
|
||||||
*-*-irix6*)
|
*-*-irix6*)
|
||||||
# Find out which ABI we are using.
|
# Find out which ABI we are using.
|
||||||
echo '#line 3616 "configure"' > conftest.$ac_ext
|
echo '#line 3630 "configure"' > conftest.$ac_ext
|
||||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||||
(eval $ac_compile) 2>&5
|
(eval $ac_compile) 2>&5
|
||||||
ac_status=$?
|
ac_status=$?
|
||||||
|
@ -5613,6 +5627,7 @@ s,@glibcpp_srcdir@,$glibcpp_srcdir,;t t
|
||||||
s,@gcc_version@,$gcc_version,;t t
|
s,@gcc_version@,$gcc_version,;t t
|
||||||
s,@toolexecdir@,$toolexecdir,;t t
|
s,@toolexecdir@,$toolexecdir,;t t
|
||||||
s,@toolexeclibdir@,$toolexeclibdir,;t t
|
s,@toolexeclibdir@,$toolexeclibdir,;t t
|
||||||
|
s,@libext@,$libext,;t t
|
||||||
s,@CC@,$CC,;t t
|
s,@CC@,$CC,;t t
|
||||||
s,@ac_ct_CC@,$ac_ct_CC,;t t
|
s,@ac_ct_CC@,$ac_ct_CC,;t t
|
||||||
s,@EXEEXT@,$EXEEXT,;t t
|
s,@EXEEXT@,$EXEEXT,;t t
|
||||||
|
|
|
@ -154,6 +154,20 @@ esac
|
||||||
AC_SUBST(toolexecdir)
|
AC_SUBST(toolexecdir)
|
||||||
AC_SUBST(toolexeclibdir)
|
AC_SUBST(toolexeclibdir)
|
||||||
|
|
||||||
|
# Figure out if we want to name the include directory and the
|
||||||
|
# library name changes differently.
|
||||||
|
includedir=include
|
||||||
|
libext=
|
||||||
|
case "${host}" in
|
||||||
|
*-darwin*)
|
||||||
|
# Darwin is the only target so far that needs a different include directory.
|
||||||
|
includedir=gnu-runtime;
|
||||||
|
libext=-gnu
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
AC_SUBST(includedir)
|
||||||
|
AC_SUBST(libext)
|
||||||
|
|
||||||
# --------
|
# --------
|
||||||
# Programs
|
# Programs
|
||||||
# --------
|
# --------
|
||||||
|
|
Loading…
Reference in New Issue