From 87c958b3cb1c6974ce88958119147053309ec7c0 Mon Sep 17 00:00:00 2001 From: adam Date: Sat, 24 Nov 2012 21:38:49 +0000 Subject: Changes 8.5.13: * --enable-aqua build for Mac OS X is now a Cocoa implementation. * Support has been added for Cygwin network pathnames. * Updated to Unicode 6.2 support. Fixes for several crashes and bugs. --- x11/tk/Makefile | 22 ++++++--- x11/tk/Makefile.version | 4 +- x11/tk/distinfo | 14 +++--- x11/tk/interpreter.mk | 6 +-- x11/tk/patches/patch-macosx_tkMacOSXClipboard.c | 15 +++++++ x11/tk/patches/patch-macosx_tkMacOSXDraw.c | 15 +++++++ x11/tk/patches/patch-unix_Makefile.in | 59 +++++++++++++++---------- x11/tk/patches/patch-unix_configure | 32 ++++++++------ 8 files changed, 113 insertions(+), 54 deletions(-) create mode 100644 x11/tk/patches/patch-macosx_tkMacOSXClipboard.c create mode 100644 x11/tk/patches/patch-macosx_tkMacOSXDraw.c (limited to 'x11/tk') diff --git a/x11/tk/Makefile b/x11/tk/Makefile index eda9f584de8..db85de21af7 100644 --- a/x11/tk/Makefile +++ b/x11/tk/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.68 2012/10/29 05:06:53 asau Exp $ +# $NetBSD: Makefile,v 1.69 2012/11/24 21:38:50 adam Exp $ DISTNAME= tk${TK_VERSION}-src PKGNAME= tk-${TK_VERSION} -PKGREVISION= 1 CATEGORIES= x11 lang MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/} @@ -21,13 +20,17 @@ GNU_CONFIGURE= yes CONFIGURE_DIRS= unix BUILD_DIRS= ${CONFIGURE_DIRS} CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib -CONFIGURE_ARGS+= --x-includes=${X11BASE:Q}/include -CONFIGURE_ARGS+= --x-libraries=${X11BASE:Q}/lib${LIBABISUFFIX:Q} +CONFIGURE_ARGS+= --x-includes=${X11BASE}/include +CONFIGURE_ARGS+= --x-libraries=${X11BASE}/lib${LIBABISUFFIX:Q} CONFIGURE_ENV+= LIB_RUNTIME_DIR=${PREFIX}/lib PTHREAD_OPTS+= require TEST_TARGET= test +.if defined(ABI) && ${ABI} == "64" +CONFIGURE_ARGS+= --enable-64bit +.endif + .include "options.mk" SUBST_CLASSES+= tk-config @@ -39,6 +42,15 @@ SUBST_SED.tk-config+= -e "s|${WRKSRC}|${PREFIX}/include/tk|" PLIST_SUBST+= SONUM=${TK_SONUM} PLIST_SUBST+= BASEVER=${TK_BASEVER} -.include "../../lang/tcl/buildlink3.mk" +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == "Darwin" +CONFIGURE_ARGS+= --enable-aqua +.else .include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" +.endif + +.include "../../lang/tcl/buildlink3.mk" +.include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/tk/Makefile.version b/x11/tk/Makefile.version index 293f45e831b..8348d01078d 100644 --- a/x11/tk/Makefile.version +++ b/x11/tk/Makefile.version @@ -1,5 +1,5 @@ -# $NetBSD: Makefile.version,v 1.9 2012/08/21 21:32:34 marino Exp $ +# $NetBSD: Makefile.version,v 1.10 2012/11/24 21:38:50 adam Exp $ TK_SONUM= 85 TK_BASEVER= 8.5 -TK_VERSION= 8.5.12 +TK_VERSION= 8.5.13 diff --git a/x11/tk/distinfo b/x11/tk/distinfo index c5eec8ff942..0d96814ead1 100644 --- a/x11/tk/distinfo +++ b/x11/tk/distinfo @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.38 2012/08/29 11:55:06 dsainty Exp $ +$NetBSD: distinfo,v 1.39 2012/11/24 21:38:50 adam Exp $ -SHA1 (tk8.5.12-src.tar.gz) = 292a01a39e9378d2455e4492f39500baeb6b63db -RMD160 (tk8.5.12-src.tar.gz) = fc864df9f1e1ebd4b4375cc46572834095e77372 -Size (tk8.5.12-src.tar.gz) = 3826062 bytes -SHA1 (patch-unix_Makefile.in) = 0e1f8a8c20c426a042ab1c061cc6031283abe1d5 -SHA1 (patch-unix_configure) = fe8cbd693bbbd891e82e27f80d2f180a6af71629 +SHA1 (tk8.5.13-src.tar.gz) = a7dc1a979201376d7e7d48ec9280839ebb52a09f +RMD160 (tk8.5.13-src.tar.gz) = f832c61d5006f9ddef93a63db9789d158b1d6202 +Size (tk8.5.13-src.tar.gz) = 4086092 bytes +SHA1 (patch-macosx_tkMacOSXClipboard.c) = ac5a5de7c0e4259a347fcb7449d304e6edb91343 +SHA1 (patch-macosx_tkMacOSXDraw.c) = b241b7d70436340a5b55b7568da994465f45d2f8 +SHA1 (patch-unix_Makefile.in) = f3b1ee8ae65b1ee341ffc21aab2d7d37ffe26198 +SHA1 (patch-unix_configure) = 459a2688731fd86c4b88fb90aa2401949ff5b74f diff --git a/x11/tk/interpreter.mk b/x11/tk/interpreter.mk index 52b34b60f49..147c0d0c3a7 100644 --- a/x11/tk/interpreter.mk +++ b/x11/tk/interpreter.mk @@ -1,4 +1,4 @@ -# $NetBSD: interpreter.mk,v 1.1 2012/08/31 11:16:12 he Exp $ +# $NetBSD: interpreter.mk,v 1.2 2012/11/24 21:38:50 adam Exp $ # # Package-settable variables: # @@ -7,10 +7,9 @@ # # See also: # replace-interpreter -# .if !defined(TK_INTERPRETER_MK) -TK_INTERPRETER_MK= # defined +TK_INTERPRETER_MK= # defined REPLACE_INTERPRETER+= wish REPLACE.wish.old= .*/wish @@ -18,4 +17,3 @@ REPLACE.wish.new= ${LOCALBASE}/bin/wish REPLACE_FILES.wish= ${REPLACE_WISH} .endif - diff --git a/x11/tk/patches/patch-macosx_tkMacOSXClipboard.c b/x11/tk/patches/patch-macosx_tkMacOSXClipboard.c new file mode 100644 index 00000000000..c5ceab5035f --- /dev/null +++ b/x11/tk/patches/patch-macosx_tkMacOSXClipboard.c @@ -0,0 +1,15 @@ +$NetBSD: patch-macosx_tkMacOSXClipboard.c,v 1.1 2012/11/24 21:38:50 adam Exp $ + +Void function should not return any values. + +--- macosx/tkMacOSXClipboard.c.orig 2012-11-24 20:54:23.000000000 +0000 ++++ macosx/tkMacOSXClipboard.c +@@ -194,7 +194,7 @@ TkMacOSXSelDeadWindow( + if (winPtr && winPtr == (TkWindow *)clipboardOwner) { + clipboardOwner = NULL; + } +- return Success; ++ return; + } + + /* diff --git a/x11/tk/patches/patch-macosx_tkMacOSXDraw.c b/x11/tk/patches/patch-macosx_tkMacOSXDraw.c new file mode 100644 index 00000000000..5a3b29cdd14 --- /dev/null +++ b/x11/tk/patches/patch-macosx_tkMacOSXDraw.c @@ -0,0 +1,15 @@ +$NetBSD: patch-macosx_tkMacOSXDraw.c,v 1.1 2012/11/24 21:38:50 adam Exp $ + +Void function should not return any values. + +--- macosx/tkMacOSXDraw.c.orig 2012-11-24 20:55:20.000000000 +0000 ++++ macosx/tkMacOSXDraw.c +@@ -744,7 +744,7 @@ DrawCGImage( + } else { + TkMacOSXDbgMsg("Drawing of empty CGImage requested"); + } +- return Success; ++ return; + } + + /* diff --git a/x11/tk/patches/patch-unix_Makefile.in b/x11/tk/patches/patch-unix_Makefile.in index 2699ebebfe5..5805847dadc 100644 --- a/x11/tk/patches/patch-unix_Makefile.in +++ b/x11/tk/patches/patch-unix_Makefile.in @@ -1,12 +1,12 @@ -$NetBSD: patch-unix_Makefile.in,v 1.1 2012/08/21 21:32:34 marino Exp $ +$NetBSD: patch-unix_Makefile.in,v 1.2 2012/11/24 21:38:50 adam Exp $ ---- unix/Makefile.in.orig 2012-07-25 16:45:53.000000000 +0000 +--- unix/Makefile.in.orig 2012-11-09 15:15:03.000000000 +0000 +++ unix/Makefile.in @@ -14,6 +14,7 @@ MAJOR_VERSION = @TK_MAJOR_VERSION@ MINOR_VERSION = @TK_MINOR_VERSION@ PATCH_LEVEL = @TK_PATCH_LEVEL@ LOCALES = @LOCALES@ -+SHLIB_VERSION = .@SHLIB_VERSION@ ++SHLIB_VERSION = @SHLIB_VERSION@ #---------------------------------------------------------------- # Things you can change to personalize the Makefile for your own @@ -37,7 +37,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.1 2012/08/21 21:32:34 marino Exp $ # Flags to pass to the linker LDFLAGS_DEBUG = @LDFLAGS_DEBUG@ -@@ -243,6 +246,7 @@ TK_STUB_LIB_FLAG = @TK_STUB_LIB_FLAG@ +@@ -245,6 +248,7 @@ TK_STUB_LIB_FLAG = @TK_STUB_LIB_FLAG@ #TK_STUB_LIB_FLAG = -ltkstub TK_LIB_FILE = @TK_LIB_FILE@ @@ -45,7 +45,16 @@ $NetBSD: patch-unix_Makefile.in,v 1.1 2012/08/21 21:32:34 marino Exp $ #TK_LIB_FILE = libtk.a # Generic lib name used in rules that apply to tcl and tk -@@ -557,6 +561,9 @@ PRIVATE_HDRS = $(GENERIC_DIR)/tkInt.h $( +@@ -276,6 +280,8 @@ SHLIB_LD = @SHLIB_LD@ + SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ + TK_SHLIB_LD_EXTRAS = @TK_SHLIB_LD_EXTRAS@ + ++SHLIB_SUFFIX = @SHLIB_SUFFIX@ ++ + # Additional search flags needed to find the various shared libraries + # at run-time. The first symbol is for use when creating a binary + # with cc, and the second is for use when running ld directly. +@@ -546,6 +552,9 @@ PRIVATE_HDRS = $(GENERIC_DIR)/tkInt.h $( DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget @@ -55,7 +64,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.1 2012/08/21 21:32:34 marino Exp $ SHELL_ENV = \ @LD_LIBRARY_PATH_VAR@="`pwd`:${TCL_BIN_DIR}:$${@LD_LIBRARY_PATH_VAR@}"; \ export @LD_LIBRARY_PATH_VAR@; \ -@@ -581,6 +588,11 @@ ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} @L +@@ -569,6 +578,11 @@ ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} @L rm -f $@ @MAKE_LIB@ @@ -67,7 +76,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.1 2012/08/21 21:32:34 marino Exp $ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} rm -f $@ @MAKE_STUB_LIB@ -@@ -703,7 +715,7 @@ install-strip: +@@ -686,7 +700,7 @@ install-strip: # some ranlibs write to current directory, and this might not always be # possible (e.g. if installing as root). @@ -76,37 +85,41 @@ $NetBSD: patch-unix_Makefile.in,v 1.1 2012/08/21 21:32:34 marino Exp $ @for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" \ "$(PKG_INSTALL_DIR)" "$(CONFIG_INSTALL_DIR)" ; \ do \ -@@ -737,13 +749,17 @@ install-binaries: $(TK_LIB_FILE) $(TK_ST +@@ -716,13 +730,20 @@ install-binaries: $(TK_LIB_FILE) $(TK_ST fi @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" @@INSTALL_LIB@ - @chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)" -+ @chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)$(SHLIB_VERSION)" -+ @cd "$(DLL_INSTALL_DIR)" && ln -sf $(LIB_FILE)$(SHLIB_VERSION) $(LIB_FILE) ++ @cd "$(DLL_INSTALL_DIR)" && if test "$(SHLIB_SUFFIX)" = ".dylib"; then \ ++ ln -sf libtk$(MAJOR_VERSION)$(MINOR_VERSION).$(SHLIB_VERSION)$(SHLIB_SUFFIX) $(LIB_FILE) ; \ ++ else \ ++ ln -sf libtk$(MAJOR_VERSION)$(MINOR_VERSION)$(SHLIB_SUFFIX).$(SHLIB_VERSION) $(LIB_FILE) ; \ ++ fi + @echo "Installing ${TK_LIB_A_FILE} to $(DLL_INSTALL_DIR)/" + @$(INSTALL_DATA) ${TK_LIB_A_FILE} $(DLL_INSTALL_DIR)/${TK_LIB_A_FILE} @if test -f "tk${MAJOR_VERSION}${MINOR_VERSION}.dll"; then \ - $(INSTALL_LIBRARY) "${TOP_DIR}/win/tk${MAJOR_VERSION}${MINOR_VERSION}.dll" "$(DLL_INSTALL_DIR)";\ + $(INSTALL_LIBRARY) "tk${MAJOR_VERSION}${MINOR_VERSION}.dll" "$(DLL_INSTALL_DIR)";\ chmod 555 "$(DLL_INSTALL_DIR)/tk${MAJOR_VERSION}${MINOR_VERSION}.dll";\ fi - @echo "Installing ${WISH_EXE} as $(BIN_INSTALL_DIR)/wish$(VERSION)@EXEEXT@" - @$(INSTALL_PROGRAM) ${WISH_EXE} "$(BIN_INSTALL_DIR)/wish$(VERSION)@EXEEXT@" + @echo "Installing ${WISH_EXE} as $(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}" + @$(INSTALL_PROGRAM) ${WISH_EXE} "$(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}" + @cd "$(BIN_INSTALL_DIR)" && ln -sf wish$(VERSION)@EXEEXT@ wish @echo "Installing tkConfig.sh to $(CONFIG_INSTALL_DIR)/" @$(INSTALL_DATA) tkConfig.sh "$(CONFIG_INSTALL_DIR)/tkConfig.sh" @if test "$(STUB_LIB_FILE)" != "" ; then \ -@@ -756,6 +772,7 @@ install-libraries: libraries +@@ -827,7 +848,7 @@ install-doc: + install-headers: @if test "$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)" != ""; then \ - XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)/X11"; fi; \ - for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}" \ -+ "$(GENERIC_INCLUDE_INSTALL_DIR)" "$(UNIX_INCLUDE_INSTALL_DIR)" \ - "$(SCRIPT_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)/images" \ - "$(SCRIPT_INSTALL_DIR)/msgs" "$(SCRIPT_INSTALL_DIR)/ttk"; \ + XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)"/X11; fi; \ +- for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}"; \ ++ for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}" "$(GENERIC_INCLUDE_INSTALL_DIR)" "$(UNIX_INCLUDE_INSTALL_DIR)"; \ do \ -@@ -770,9 +787,12 @@ install-libraries: libraries - chmod +x $(SRC_DIR)/install-sh; \ - fi - @echo "Installing header files"; + if [ -n "$$i" -a ! -d "$$i" ] ; then \ + echo "Making directory $$i"; \ +@@ -836,9 +857,12 @@ install-headers: + fi; \ + done; + @echo "Installing header files to $(INCLUDE_INSTALL_DIR)/"; - @for i in $(PUBLIC_HDRS); \ + $(INSTALL_DATA) $(GENERIC_DIR)/*.h "$(GENERIC_INCLUDE_INSTALL_DIR)"/ + $(INSTALL_DATA) $(UNIX_DIR)/*.h "$(UNIX_INCLUDE_INSTALL_DIR)"/ diff --git a/x11/tk/patches/patch-unix_configure b/x11/tk/patches/patch-unix_configure index b0bb04926b5..83bf58fced3 100644 --- a/x11/tk/patches/patch-unix_configure +++ b/x11/tk/patches/patch-unix_configure @@ -1,6 +1,6 @@ -$NetBSD: patch-unix_configure,v 1.4 2012/08/29 11:55:06 dsainty Exp $ +$NetBSD: patch-unix_configure,v 1.5 2012/11/24 21:38:50 adam Exp $ ---- unix/configure.orig 2012-07-25 16:45:53.000000000 +0000 +--- unix/configure.orig 2012-11-09 15:15:03.000000000 +0000 +++ unix/configure @@ -4843,10 +4843,10 @@ fi # LDFLAGS_ARCH so they eventually end up in LDFLAGS even if [load] @@ -87,7 +87,7 @@ $NetBSD: patch-unix_configure,v 1.4 2012/08/29 11:55:06 dsainty Exp $ Darwin-*) ;; SCO_SV-3.2*) ;; *) SHLIB_CFLAGS="-fPIC" ;; -@@ -7169,12 +7163,12 @@ +@@ -7169,12 +7163,12 @@ fi if test "$SHARED_LIB_SUFFIX" = ""; then @@ -102,16 +102,20 @@ $NetBSD: patch-unix_configure,v 1.4 2012/08/29 11:55:06 dsainty Exp $ fi DLL_INSTALL_DIR="\$(LIB_INSTALL_DIR)" -@@ -7190,7 +7184,7 @@ fi +@@ -7190,7 +7184,11 @@ fi else - INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)"' -+ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)$(SHLIB_VERSION)"' ++ if test "${SHLIB_SUFFIX}" = ".dylib" ; then ++ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/libtk$(MAJOR_VERSION)$(MINOR_VERSION).$(SHLIB_VERSION)$(SHLIB_SUFFIX)"' ++ else ++ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE).$(SHLIB_VERSION)"' ++ fi fi -@@ -7224,7 +7218,7 @@ fi +@@ -7224,7 +7222,7 @@ fi else MAKE_STUB_LIB='${STLIB_LD} $@ ${STUB_LIB_OBJS} ; ${RANLIB} $@' @@ -120,7 +124,7 @@ $NetBSD: patch-unix_configure,v 1.4 2012/08/29 11:55:06 dsainty Exp $ fi -@@ -10358,7 +10352,7 @@ echo $ECHO_N "checking for X11 libraries +@@ -10358,7 +10356,7 @@ echo $ECHO_N "checking for X11 libraries if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl -o -r $i/libX11.dylib; then echo "$as_me:$LINENO: result: $i" >&5 echo "${ECHO_T}$i" >&6 @@ -129,7 +133,7 @@ $NetBSD: patch-unix_configure,v 1.4 2012/08/29 11:55:06 dsainty Exp $ x_libraries="$i" break fi -@@ -10367,7 +10361,7 @@ echo "${ECHO_T}$i" >&6 +@@ -10367,7 +10365,7 @@ echo "${ECHO_T}$i" >&6 if test "$x_libraries" = ""; then XLIBSW=-lX11 else @@ -138,8 +142,8 @@ $NetBSD: patch-unix_configure,v 1.4 2012/08/29 11:55:06 dsainty Exp $ fi fi if test "$XLIBSW" = nope ; then -@@ -11383,18 +11377,14 @@ _ACEOF - else +@@ -11386,18 +11384,14 @@ else + fi # libdir must be a fully qualified path and not ${exec_prefix}/lib eval libdir="$libdir" - if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then @@ -149,7 +153,7 @@ $NetBSD: patch-unix_configure,v 1.4 2012/08/29 11:55:06 dsainty Exp $ - fi + TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`" TK_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_LIB_FLAG}" - if test "${ac_cv_cygwin}" = "yes" -a "$SHARED_BUILD" = "1"; then + if test "${ac_cv_cygwin}" = "yes" -a "$SHARED_BUILD" = "1"; then WISH_BUILD_LIB_SPEC="-L\$(TOP_DIR)/win -ltk${TK_MAJOR_VERSION}${TK_MINOR_VERSION} \${TCL_LIB_SPEC}" else WISH_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_LIB_FLAG} \${WISH_LIBS}" @@ -158,8 +162,8 @@ $NetBSD: patch-unix_configure,v 1.4 2012/08/29 11:55:06 dsainty Exp $ + TK_LIB_SPEC="-L${libdir} ${COMPILER_RPATH_FLAG}${libdir} ${TK_LIB_FLAG}" fi - # Support for building the Aqua resource files -@@ -11422,11 +11412,7 @@ fi + #-------------------------------------------------------------------- +@@ -11409,11 +11403,7 @@ fi eval "TK_STUB_LIB_FILE=libtkstub${TK_UNSHARED_LIB_SUFFIX}" eval "TK_STUB_LIB_DIR=${libdir}" @@ -172,7 +176,7 @@ $NetBSD: patch-unix_configure,v 1.4 2012/08/29 11:55:06 dsainty Exp $ TK_BUILD_STUB_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_STUB_LIB_FLAG}" TK_STUB_LIB_SPEC="-L${TK_STUB_LIB_DIR} ${TK_STUB_LIB_FLAG}" -@@ -12246,6 +12232,7 @@ s,@APP_RSRC_FILE@,$APP_RSRC_FILE,;t t +@@ -12233,6 +12223,7 @@ s,@APP_RSRC_FILE@,$APP_RSRC_FILE,;t t s,@REZ@,$REZ,;t t s,@REZ_FLAGS@,$REZ_FLAGS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t -- cgit v1.2.3