From patchwork Sun May 20 18:54:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Holljes X-Patchwork-Id: 9025 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp7565556jad; Sun, 20 May 2018 11:54:51 -0700 (PDT) X-Google-Smtp-Source: AB8JxZp66m+giC+OI7PD2PpTphALe64lbKh9ehPFR0zhvOKnd8luUo98QnPaGC0iAffPkxLB+ZXY X-Received: by 2002:a1c:35c7:: with SMTP id c190-v6mr8349380wma.147.1526842491688; Sun, 20 May 2018 11:54:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526842491; cv=none; d=google.com; s=arc-20160816; b=d8wUXzW6sszZs+F4dwCKP6kKPPIAIYcCKgl+GOYupbA9ZGyVfkaud18QBPkpuLt6rn uKhcGg0GmBVNSBrOt6DD6BDK8c4mqZawRjf+8XMLPcYPomD8hEigTWnIWAfEYZYgeF3K tb205KDdYefwwSiX8rc7MAbVo1CgBNPjZzDbAtYtbI86Su7pAtNdrCxqF46XZ7uvCWms ApzsxlCTcE57hliCY5KF7ilqHpxiNXEQexNF1tpGv7e3XZbqKFZAJaNMCGxAWLJngQnK pNZE1/1Iu0R5MKuy/XzrX/yalBUfTiQW7TVCfK+zKoSL+Lx2pMo3W2Cipl3scajkrCRw WXGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=A8ObuvyzRdvQ6I2XDJDxOCN9uoWy0U/g7It0PTa7dag=; b=fhl2ETZykHl9j0BJms+EJV5AEWSdzB+6vIi9xn8szBtFarFkJh+pp5mXMCxhDQvabN c3a1q8FMqH8uQvEhhk/Swm8Jsc5FXGUzzvzniQiKBIvMUHyerJrRDDI36AN8Nzu6nuAf XFHKcmPdqqSrzvGQPbtb+Kp+SD1FlMoKcyZMk4EbxGep+VcCEaynqyUJF42q3mvTf7Ne jYvI/MgYdS5+pXbY3hNRLQCMov420vs+C4pLrntvhfmhCz3KK4QMXghbE1dVxKV4k5AP LAoS1jQ9gFJnXnTJDwBD+GVacZONrk6c1QFCLNuH1bTUXZY3caS5K5FOEwKf4YKFZg7g m8EQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=amLMXB5h; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k63-v6si10759684wrc.163.2018.05.20.11.54.51; Sun, 20 May 2018 11:54:51 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=amLMXB5h; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E9FE6689C83; Sun, 20 May 2018 21:53:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f52.google.com (mail-wm0-f52.google.com [74.125.82.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2B74C68A4B6 for ; Sun, 20 May 2018 21:53:40 +0300 (EEST) Received: by mail-wm0-f52.google.com with SMTP id t11-v6so21864502wmt.0 for ; Sun, 20 May 2018 11:54:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8Ok0LUdWYOp3qZwunTW34vzMub2DR0i6GaM8H0vV6mc=; b=amLMXB5hPGaMDT8pfZoDW3HzqNXKgSFsLZZuJRlkPzZYlRu6qYLntQbNjXwPd00M5j tWXp87YV4+zXIF5EUlddvrghHlkoGVX0xJjJjXwn6hwArog0/+Fv8ryk/G3FHMVorw8i wfpTtJtdFwLorrMqvAtjz0Gds+xwEExAsX94sciFKB9b23hZVFlh2vzBz4TG2c+F6DOX 6TwqT655SVte/oYaqo3xEqft4EXo7/0F3BBfSTWQvBVSc0c3hcLoOT6Tade2TacREJBV vbrqrdNFHJAsMosbF9JDsf58bu7eUmdYf0o5D2NZZYOMjnKvekO4nMOd2Vlw+LpEZGqz 4QXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8Ok0LUdWYOp3qZwunTW34vzMub2DR0i6GaM8H0vV6mc=; b=Awc4RaB1CHRUiE2MP1lg9Gt3czFvj3ApS30OjacMukbh04oo1x2UE47RGD4mJgyL7X ATKd8rH4gGdT/Qrc/wNNQBPTKQ6g/uh49KMLh8gPpBdCzHl+FavCFkZ6BsulBuPQRkU7 3HbreKy7r7MR3VGd7XpfADTGVTg1U4hsglt7TYaiMGnyti+kwi1mpZNLVrTeFiyfenCx djOwXj+WxvN8iTDjAv2UgJZ6+3VJV/Su/yahRCsKpZfJDN49CjhzcD/VU5deJ3jvI5tY xHtEr09qQs/Qx9X034xaf9Fq1UWyJ8j+ZmIkBD2F8+e8Ftc+SQpYVtENW/PkabBMm1lh JdVA== X-Gm-Message-State: ALKqPwf4CYqGVhumP2CqXQMk+ksN8oqV/7hdqFzFwJgj5cnKAY0ahGSr jAwCPRffwsV6I+xLYFfAh3JLWg== X-Received: by 2002:a1c:5403:: with SMTP id i3-v6mr8661161wmb.37.1526842459888; Sun, 20 May 2018 11:54:19 -0700 (PDT) Received: from localhost.localdomain ([46.5.2.0]) by smtp.gmail.com with ESMTPSA id u8-v6sm3755918wmc.40.2018.05.20.11.54.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 20 May 2018 11:54:19 -0700 (PDT) From: Stephan Holljes To: ffmpeg-devel@ffmpeg.org Date: Sun, 20 May 2018 20:54:03 +0200 Message-Id: <20180520185404.29836-8-klaxa1337@googlemail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180520185404.29836-1-klaxa1337@googlemail.com> References: <20180520185404.29836-1-klaxa1337@googlemail.com> Subject: [FFmpeg-devel] [PATCH 7/8] Makefile: Update Makefile X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Stephan Holljes MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Stephan Holljes --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index fbecdeb..83bc4e0 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,11 @@ all: ffserver LAV_FLAGS = $(shell pkg-config --libs --cflags libavformat libavcodec libavutil) +LUA_FLAGS = $(shell pkg-config --libs --cflags lua5.3) CFLAGS=-fsanitize=address -fsanitize=undefined # LAV_FLAGS = -L/usr/local/lib -lavcodec -lavformat -lavutil -ffserver: segment.o publisher.o lavfhttpd.o ffserver.c - cc -g -Wall $(CFLAGS) $(LAV_FLAGS) -lpthread -o ffserver segment.o publisher.o lavfhttpd.o ffserver.c +ffserver: segment.o publisher.o lavfhttpd.o configreader.o ffserver.c + cc -g -Wall $(CFLAGS) $(LAV_FLAGS) $(LUA_FLAGS) -lpthread -o ffserver segment.o publisher.o lavfhttpd.o configreader.o ffserver.c segment.o: segment.c segment.h cc -g -Wall $(CFLAGS) $(LAV_FLAGS) -lpthread -c segment.c @@ -15,5 +16,7 @@ publisher.o: publisher.c publisher.h lavfhttpd.o: lavfhttpd.c httpd.h cc -g -Wall $(CFLAGS) $(LAV_FLAGS) -lpthread -c lavfhttpd.c +configreader.o: configreader.c configreader.h httpd.h + cc -g -Wall $(CFLAGS) $(LAV_FLAGS) $(LUA_FLAGS) -c configreader.c clean: rm -f *.o ffserver