From patchwork Thu May 31 22:20:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Holljes X-Patchwork-Id: 9185 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp158517jad; Thu, 31 May 2018 15:21:00 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJOiZmMmnJBrNnrmpRBUkvQKI4vw1cyqWImjKOxNLkeKAJ7xOrApTTTIXEPMyBovOFduDFN X-Received: by 2002:a1c:ec84:: with SMTP id h4-v6mr1030473wmi.154.1527805260349; Thu, 31 May 2018 15:21:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527805260; cv=none; d=google.com; s=arc-20160816; b=M7TRJ9314MhLwGcFVwWIgd4tHcNadzPUiX7zdkiWt648aXFQ2A9wGRvIN2DH5xl3iD KI5wbN3iPV6W3HfOVmAVoDkpETDtyOldhtgO4NRcdHE//HxLYFG2F/tZcqEmf9MFkkR3 uiiBbHDEIXb6VnnffivLGk0E0v62YWnQ8ydFlvi/wRf7ijI9gSHDuHOFHnGY2xvOn8iD Oe0FgxYCWVkCe/9SZorvpNn1ziH58J55XrM6ft251qCQ7z2NiHcXIAi/fYYzTAmzkHzb E11EEQ51T/B3mh9i7fhU/+vD6Ur+aVPCB0LxLQlOqhI9ZMdE+8gLn2CTzYIBAYFbWHgr UR2Q== 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=eV4dXbYqeFiiaqXtGpriiTYU/2z/89l8yPtYZkYUPYTSQeji6lspGJWIA0qjfVt3z4 FVfb3KALf66pP8tM9Ml/GWsgMmldn+lQAzyWYmKq4PdEW/+Mrpzk/Mua3LeU104mIQ02 q4Wn6+Gvqt3Q8aFnYZabk+hp6/+2xIhton3f3xoZGnbTxUhgpnyLZRUYHa2O6uOACNtd 2jlpOW4lC9jBiG2CfzlftHwTVBsca8qfkOdH4dwIAQ14Y1ZTs4AuXfQ7mrODQhVKMK5M cxCJnPf+qmI9TioAed45FaR8LEEBovDSa1+ur9QnDLAQbpSwuRlmqoMPvX477JzrAhc9 +W+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=VMRLZR9h; 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 a5-v6si8661110wrc.139.2018.05.31.15.20.59; Thu, 31 May 2018 15:21:00 -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=VMRLZR9h; 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 E4A2068A444; Fri, 1 Jun 2018 01:20:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f44.google.com (mail-wm0-f44.google.com [74.125.82.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 852BC689DE7 for ; Fri, 1 Jun 2018 01:20:06 +0300 (EEST) Received: by mail-wm0-f44.google.com with SMTP id 18-v6so51088438wml.2 for ; Thu, 31 May 2018 15:20:51 -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=VMRLZR9hW//1DlBg1pElinz4CG4LWp0d1uUh+cvGeLzJvDD/Z8lUK2MMnlX/lkOwS8 WynQY5gTurXQ0YzZO36yEfLUDxUQyDo26B1X5ji7bVynMSQDudmVjuzfdroSlKHIxh7r GdbqDE8U9GYXY7TJ9oaCu0nI2ZiAAs2XM6e+kX9HytkggMqAIXnDfGIy0CQuUWUnVPYH ccaiIGi0OhdGf1TYIOmOdauTc8rdT7a6JwbvvpnAK1c5LubdE4YKvyxCGfoeQSwcy/Lz 7wuv+ZV8fSMi0dGhwu7yMOZdJKKP2M5r/wFdvMUAoM9NoCNk8SQvYoi+LLMiLe62HMiw ZZKQ== 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=rWT9nUPzfkQLsNsOzdPFKKFg1q2Jw3GvgnDGkBHg0K4tAQh4cA0v3xq30HKUIOaEwn VhDILpDjlrUbET9cejpn2MTnPcZdIxUM2VBNb1Uf+On1T6PpXEvxLQ5e4gjjCv5Lqgdz c3dZBJNTFw1kUBSUPR1Qg29Cwj9LVUFfK602Fzoz7zvTVdf9LXGuQ21u0sxivo6qSqgQ ub4iVNPLzpBErlGNm7Ut0e+O+k1ledqLxnt5hbK8R/UF/++NzxdRH9buM+Ys2SrFDiMo A++19zobW2nTkYm+VbgbQLeG0kOgvezrU2z0FRhq6Q+S1WU+6N2+GTbNMtFEVBsO/3d5 ziQg== X-Gm-Message-State: APt69E1GueUShXVno2l90bb/LW4Iyixq/1hd6bd/Ft1Rb9an2jt+ZG3+ somIw2LDBCzK8iicRzRrnoTnmQ== X-Received: by 2002:a1c:9712:: with SMTP id z18-v6mr1023860wmd.28.1527805251017; Thu, 31 May 2018 15:20:51 -0700 (PDT) Received: from localhost.localdomain ([46.5.2.0]) by smtp.gmail.com with ESMTPSA id 72-v6sm38288429wrb.22.2018.05.31.15.20.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 May 2018 15:20:50 -0700 (PDT) From: Stephan Holljes To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Jun 2018 00:20:31 +0200 Message-Id: <20180531222032.30111-8-klaxa1337@googlemail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180531222032.30111-1-klaxa1337@googlemail.com> References: <20180528181859.12182-1-klaxa1337@googlemail.com> <20180531222032.30111-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