[Midnightbsd-cvs] src [10606] trunk/lib/libz/Makefile: cleanup

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Jun 9 11:19:05 EDT 2018


Revision: 10606
          http://svnweb.midnightbsd.org/src/?rev=10606
Author:   laffer1
Date:     2018-06-09 11:19:04 -0400 (Sat, 09 Jun 2018)
Log Message:
-----------
cleanup

Modified Paths:
--------------
    trunk/lib/libz/Makefile

Modified: trunk/lib/libz/Makefile
===================================================================
--- trunk/lib/libz/Makefile	2018-06-09 15:17:45 UTC (rev 10605)
+++ trunk/lib/libz/Makefile	2018-06-09 15:19:04 UTC (rev 10606)
@@ -1,20 +1,18 @@
 # $MidnightBSD$
-#
 # $FreeBSD: head/lib/libz/Makefile 232263 2012-02-28 18:30:18Z dim $
 #
 
-ZLIBSRC=	${.CURDIR}/../../contrib/zlib
-
-.PATH:		${ZLIBSRC}
-
 LIB=		z
 SHLIBDIR?=	/lib
 SHLIB_MAJOR=	6
 MAN=		zlib.3
 
-CFLAGS+=	-DHAS_snprintf -DHAS_vsnprintf -I${.CURDIR} -I${.ZLIBSRC}
+ZLIBSRC=	${SRCTOP}/contrib/zlib
 
+.PATH:		${ZLIBSRC}
 
+CFLAGS+=	-DHAS_snprintf -DHAS_vsnprintf -I${.CURDIR}
+
 WARNS?=		3
 
 CLEANFILES+=	example.o example foo.gz minigzip.o minigzip
@@ -65,3 +63,7 @@
 .endif
 
 .include <bsd.lib.mk>
+
+## XXX: clang integrated-as doesn't grok .intel_syntax directives yet
+#ACFLAGS.gvmat64.S=	${CLANG_NO_IAS}
+#ACFLAGS+=		${ACFLAGS.${.IMPSRC:T}}



More information about the Midnightbsd-cvs mailing list