summaryrefslogtreecommitdiff
path: root/src/libsystemd-firewall
diff options
context:
space:
mode:
Diffstat (limited to 'src/libsystemd-firewall')
-rw-r--r--src/libsystemd-firewall/Makefile43
-rw-r--r--src/libsystemd-firewall/src/Makefile15
2 files changed, 15 insertions, 43 deletions
diff --git a/src/libsystemd-firewall/Makefile b/src/libsystemd-firewall/Makefile
deleted file mode 100644
index cd29551ff2..0000000000
--- a/src/libsystemd-firewall/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- Mode: makefile; indent-tabs-mode: t -*-
-#
-# This file is part of systemd.
-#
-# Copyright 2010-2012 Lennart Poettering
-# Copyright 2010-2012 Kay Sievers
-# Copyright 2013 Zbigniew Jędrzejewski-Szmek
-# Copyright 2013 David Strauss
-# Copyright 2016 Luke Shumaker
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# systemd is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with systemd; If not, see <http://www.gnu.org/licenses/>.
-include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
-include $(topsrcdir)/build-aux/Makefile.head.mk
-
-ifneq ($(HAVE_LIBIPTC),)
-noinst_LTLIBRARIES += \
- libsystemd-firewall.la
-
-libsystemd-firewall_la_SOURCES = \
- src/shared/firewall-util.h \
- src/shared/firewall-util.c
-
-libsystemd-firewall_la_CFLAGS = \
- $(LIBIPTC_CFLAGS)
-
-libsystemd-firewall_la_LIBADD = \
- $(LIBIPTC_LIBS)
-endif # HAVE_LIBIPTC
-
-nested.subdirs += src
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libsystemd-firewall/src/Makefile b/src/libsystemd-firewall/src/Makefile
index 8166d5a253..797c9b6819 100644
--- a/src/libsystemd-firewall/src/Makefile
+++ b/src/libsystemd-firewall/src/Makefile
@@ -23,4 +23,19 @@
include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
include $(topsrcdir)/build-aux/Makefile.head.mk
+ifneq ($(HAVE_LIBIPTC),)
+noinst_LTLIBRARIES += \
+ libsystemd-firewall.la
+
+libsystemd-firewall_la_SOURCES = \
+ src/shared/firewall-util.h \
+ src/shared/firewall-util.c
+
+libsystemd-firewall_la_CFLAGS = \
+ $(LIBIPTC_CFLAGS)
+
+libsystemd-firewall_la_LIBADD = \
+ $(LIBIPTC_LIBS)
+endif # HAVE_LIBIPTC
+
include $(topsrcdir)/build-aux/Makefile.tail.mk