From nobody Mon Aug 01 19:52:40 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4LxTLJ5cPpz4XmRc; Mon, 1 Aug 2022 19:52:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LxTLJ54Xyz3vPH; Mon, 1 Aug 2022 19:52:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659383560; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L99AGJ0f8zU0ElmjotSmetuTGn8UxFI3AQ9Fp1Tq1Ng=; b=MvPVp3Sjk6Eu3Fxbu0Ktfz456hrRlRWgJwei+kfuOQ37dZQWqfXXaINC8eNTN44xmqimkc fx4p5wdlQP97Fd2+jkIklfy0OyKNEBcPE1ATtKxQyJmJzT//+7mn1TTqc6oUonbgY4L5Hn v1JOviGv4oGhSNXKfq46N2y/Her9h1XB46uqXEOdxS0pFPu3/YDIKPJxJORWKXEFXV4JLh WRSD8m4b+ls998TY5SuuAqZx3yiOX5sjoxZlnC0vtG6UFMXaHjYu+vHcnd+jDU75btcTB6 6ma/qf7mwx94il2wxag0j9O2/6UHYZtdUfNXMwglYoD+BJWMynzinZtwHhH04g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4LxTLJ4BdpzlpB; Mon, 1 Aug 2022 19:52:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 271JqeRO085002; Mon, 1 Aug 2022 19:52:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 271JqeeC085001; Mon, 1 Aug 2022 19:52:40 GMT (envelope-from git) Date: Mon, 1 Aug 2022 19:52:40 GMT Message-Id: <202208011952.271JqeeC085001@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: d1f5aa5633ea - main - wtap: cleanup module Makefile List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d1f5aa5633ea8520b03bd8ed90d57b020d89a45c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659383560; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L99AGJ0f8zU0ElmjotSmetuTGn8UxFI3AQ9Fp1Tq1Ng=; b=hzaXw97pqTTC+x7eROnnUctB8Gg3m4WeJBVCl0NRrFCpr4SHww6mvU7lG5W3UI5tlKBGJK HemVm9/wSq+FGzNIG7H38e3aX/RdyQMoG/kqoxGvA/tcJ3sSYH7j0GbDlNOoxavyy1pQqS wYkRLlw89KdUchBAlJ2/JCHbuXkPWqp052KmrYKhJVteorQ59MHixkK3+EeEhGPt2RCs91 2hY6tslj4FU7lI+uXHBb9MRE5V1WZGBOnbR6NddEXgO0CAM/D7e2cZR8WAfoDmGcOg8Jn3 CLuMIkhWFnPqkFrAqom0RixsNWY/+6ZSQwKwqJ5d/CYh05qYUgtBjS0SnfKcig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659383560; a=rsa-sha256; cv=none; b=W5gBEZnaxdWc+FTy3jtHYM8EEZDcWydOEAm+Mojbasgds3UE7e3I25DG33L7aRYfX5Q2Yx i8BarchUhlZQYF/YOsW5TjHaksUHy+S9sOLUQOdELvZhpaSGdjgS7ZL8wdFrJQ8fs0V2QI b22Z/4qv6vcxZ5IIscrHaEusRiOLyAOF8XBkbSmP+RSQUpyynTHFblPDsezjI9iHKRljXV 3GHG9NtuPGwBCxZRlXOrKH8nM9d05BvFDd6XH7p7CSz6ChCrotN5SYpt3x7pXEuHQMNiTz ZuDpDx685Txa9G1B8AJlL0LGLYDE1FKpIsuxchndCGel/C30u+wLLlMJJcev/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=d1f5aa5633ea8520b03bd8ed90d57b020d89a45c commit d1f5aa5633ea8520b03bd8ed90d57b020d89a45c Author: Bjoern A. Zeeb AuthorDate: 2022-08-01 19:43:55 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-08-01 19:49:59 +0000 wtap: cleanup module Makefile Remove comments and change whitespace. Cleanup the opt_* and -nclude opt_global.h bits to avoid various warnings. --- sys/modules/wtap/Makefile | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/sys/modules/wtap/Makefile b/sys/modules/wtap/Makefile index 4386bf0dd7ad..d8ec70a2d3f0 100644 --- a/sys/modules/wtap/Makefile +++ b/sys/modules/wtap/Makefile @@ -1,27 +1,24 @@ # $FreeBSD$ +KMOD= wtap -# Declare Name of kernel module -KMOD = wtap - -# Enumerate Source files for kernel module .PATH: ${SRCTOP}/sys/dev/wtap -SRCS = if_wtap_module.c if_wtap.c if_medium.c +SRCS= if_wtap_module.c if_wtap.c if_medium.c .PATH: ${SRCTOP}/sys/dev/wtap/wtap_hal -SRCS += hal.c +SRCS+= hal.c .PATH: ${SRCTOP}/sys/dev/wtap/plugins -SRCS += visibility.c +SRCS+= visibility.c -SRCS += opt_global.h +SRCS+= opt_wlan.h opt_global.h .if !defined(KERNBUILDDIR) -CFLAGS+= -include opt_global.h - +.if defined(VIMAGE) opt_global.h: - echo "#define VIMAGE 1" > ${.TARGET} + echo "#define VIMAGE 1" >> ${.TARGET} +CFLAGS+= -include opt_global.h +.endif .endif -# Include kernel module makefile .include