This commit is contained in:
matthieu 2016-10-02 10:30:28 +00:00
parent d9e10c2579
commit f086547c98
2 changed files with 13 additions and 31 deletions

16
lib/libXaw/configure vendored
View File

@ -705,8 +705,6 @@ XAW7_LIBS
XAW7_CFLAGS
XAW6_LIBS
XAW6_CFLAGS
SHARED_LIBS_FALSE
SHARED_LIBS_TRUE
PLATFORM_DARWIN_FALSE
PLATFORM_DARWIN_TRUE
PLATFORM_WIN32_FALSE
@ -18523,16 +18521,6 @@ else
fi
# some platforms don't even have shared libs
if test -f /usr/libexec/ld.so; then
SHARED_LIBS_TRUE=
SHARED_LIBS_FALSE='#'
else
SHARED_LIBS_TRUE='#'
SHARED_LIBS_FALSE=
fi
# Whether to build Xaw6
# Check whether --enable-xaw6 was given.
@ -19014,10 +19002,6 @@ if test -z "${PLATFORM_DARWIN_TRUE}" && test -z "${PLATFORM_DARWIN_FALSE}"; then
as_fn_error $? "conditional \"PLATFORM_DARWIN\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${SHARED_LIBS_TRUE}" && test -z "${SHARED_LIBS_FALSE}"; then
as_fn_error $? "conditional \"SHARED_LIBS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${BUILD_XAW6_TRUE}" && test -z "${BUILD_XAW6_FALSE}"; then
as_fn_error $? "conditional \"BUILD_XAW6\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5

View File

@ -1398,10 +1398,8 @@ maintainer-clean-generic:
@echo "it deletes files that may require special tools to rebuild."
@BUILD_XAW6_FALSE@uninstall-local:
@PLATFORM_WIN32_TRUE@uninstall-local:
@SHARED_LIBS_FALSE@uninstall-local:
@BUILD_XAW6_FALSE@@BUILD_XAW7_FALSE@install-exec-hook:
@PLATFORM_WIN32_TRUE@install-exec-hook:
@SHARED_LIBS_FALSE@install-exec-hook:
clean: clean-am
clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
@ -1492,21 +1490,21 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-local
uninstall-local
@BUILD_XAW6_TRUE@@PLATFORM_WIN32_FALSE@@SHARED_LIBS_TRUE@install-exec-hook::
@BUILD_XAW6_TRUE@@PLATFORM_DARWIN_TRUE@@PLATFORM_WIN32_FALSE@@SHARED_LIBS_TRUE@ $(AM_V_at)rm -f $(DESTDIR)$(libdir)/libXaw.6.@LIBEXT@
@BUILD_XAW6_TRUE@@PLATFORM_DARWIN_TRUE@@PLATFORM_WIN32_FALSE@@SHARED_LIBS_TRUE@ $(AM_V_GEN)(cd $(DESTDIR)$(libdir) && $(LN_S) libXaw6.6.@LIBEXT@ libXaw.6.@LIBEXT@)
@BUILD_XAW6_TRUE@@PLATFORM_DARWIN_FALSE@@PLATFORM_WIN32_FALSE@@SHARED_LIBS_TRUE@ $(AM_V_at)rm -f $(DESTDIR)$(libdir)/libXaw.@LIBEXT@.6
@BUILD_XAW6_TRUE@@PLATFORM_DARWIN_FALSE@@PLATFORM_WIN32_FALSE@@SHARED_LIBS_TRUE@ $(AM_V_GEN)(cd $(DESTDIR)$(libdir) && $(LN_S) libXaw6.@LIBEXT@.6 libXaw.@LIBEXT@.6)
@BUILD_XAW6_TRUE@@PLATFORM_WIN32_FALSE@install-exec-hook::
@BUILD_XAW6_TRUE@@PLATFORM_DARWIN_TRUE@@PLATFORM_WIN32_FALSE@ $(AM_V_at)rm -f $(DESTDIR)$(libdir)/libXaw.6.@LIBEXT@
@BUILD_XAW6_TRUE@@PLATFORM_DARWIN_TRUE@@PLATFORM_WIN32_FALSE@ $(AM_V_GEN)(cd $(DESTDIR)$(libdir) && $(LN_S) libXaw6.6.@LIBEXT@ libXaw.6.@LIBEXT@)
@BUILD_XAW6_TRUE@@PLATFORM_DARWIN_FALSE@@PLATFORM_WIN32_FALSE@ $(AM_V_at)rm -f $(DESTDIR)$(libdir)/libXaw.@LIBEXT@.6
@BUILD_XAW6_TRUE@@PLATFORM_DARWIN_FALSE@@PLATFORM_WIN32_FALSE@ $(AM_V_GEN)(cd $(DESTDIR)$(libdir) && $(LN_S) libXaw6.@LIBEXT@.6 libXaw.@LIBEXT@.6)
@BUILD_XAW6_TRUE@@PLATFORM_WIN32_FALSE@@SHARED_LIBS_TRUE@uninstall-local::
@BUILD_XAW6_TRUE@@PLATFORM_DARWIN_TRUE@@PLATFORM_WIN32_FALSE@@SHARED_LIBS_TRUE@ $(AM_V_at)rm -f $(DESTDIR)$(libdir)/libXaw.6.@LIBEXT@
@BUILD_XAW6_TRUE@@PLATFORM_DARWIN_FALSE@@PLATFORM_WIN32_FALSE@@SHARED_LIBS_TRUE@ $(AM_V_at)rm -f $(DESTDIR)$(libdir)/libXaw.@LIBEXT@.6
@BUILD_XAW6_TRUE@@PLATFORM_WIN32_FALSE@uninstall-local::
@BUILD_XAW6_TRUE@@PLATFORM_DARWIN_TRUE@@PLATFORM_WIN32_FALSE@ $(AM_V_at)rm -f $(DESTDIR)$(libdir)/libXaw.6.@LIBEXT@
@BUILD_XAW6_TRUE@@PLATFORM_DARWIN_FALSE@@PLATFORM_WIN32_FALSE@ $(AM_V_at)rm -f $(DESTDIR)$(libdir)/libXaw.@LIBEXT@.6
@BUILD_XAW7_TRUE@@PLATFORM_WIN32_FALSE@@SHARED_LIBS_TRUE@install-exec-hook::
@BUILD_XAW7_TRUE@@PLATFORM_DARWIN_TRUE@@PLATFORM_WIN32_FALSE@@SHARED_LIBS_TRUE@ $(AM_V_at)rm -f $(DESTDIR)$(libdir)/libXaw.7.@LIBEXT@
@BUILD_XAW7_TRUE@@PLATFORM_DARWIN_TRUE@@PLATFORM_WIN32_FALSE@@SHARED_LIBS_TRUE@ $(AM_V_GEN)(cd $(DESTDIR)$(libdir) && ln -s libXaw7.7.@LIBEXT@ libXaw.7.@LIBEXT@)
@BUILD_XAW7_TRUE@@PLATFORM_DARWIN_FALSE@@PLATFORM_WIN32_FALSE@@SHARED_LIBS_TRUE@ $(AM_V_at)rm -f $(DESTDIR)$(libdir)/libXaw.@LIBEXT@.15.0
@BUILD_XAW7_TRUE@@PLATFORM_DARWIN_FALSE@@PLATFORM_WIN32_FALSE@@SHARED_LIBS_TRUE@ $(AM_V_GEN)(cd $(DESTDIR)$(libdir) && ln -s libXaw7.@LIBEXT@.15.0 libXaw.@LIBEXT@.15.0)
@BUILD_XAW7_TRUE@@PLATFORM_WIN32_FALSE@install-exec-hook::
@BUILD_XAW7_TRUE@@PLATFORM_DARWIN_TRUE@@PLATFORM_WIN32_FALSE@ $(AM_V_at)rm -f $(DESTDIR)$(libdir)/libXaw.7.@LIBEXT@
@BUILD_XAW7_TRUE@@PLATFORM_DARWIN_TRUE@@PLATFORM_WIN32_FALSE@ $(AM_V_GEN)(cd $(DESTDIR)$(libdir) && ln -s libXaw7.7.@LIBEXT@ libXaw.7.@LIBEXT@)
@BUILD_XAW7_TRUE@@PLATFORM_DARWIN_FALSE@@PLATFORM_WIN32_FALSE@ $(AM_V_at)rm -f $(DESTDIR)$(libdir)/libXaw.@LIBEXT@.15.0
@BUILD_XAW7_TRUE@@PLATFORM_DARWIN_FALSE@@PLATFORM_WIN32_FALSE@ $(AM_V_GEN)(cd $(DESTDIR)$(libdir) && ln -s libXaw7.@LIBEXT@.15.0 libXaw.@LIBEXT@.15.0)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.