relicense to LGPLv2.1 (with exceptions)

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 493e15e7c260e7984e450565f0e6eb5aea031d2e..0a9f2e519873716078e4e3facc246093a9bea1f7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,16 +4,16 @@
 #  Copyright 2010-2012 Kay Sievers
 #
 #  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
+#  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
-#  General Public License for more details.
+#  Lesser General Public License for more details.
 #
-#  You should have received a copy of the GNU General Public License
+#  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
@@ -120,6 +120,7 @@ AM_CPPFLAGS = \
        -DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \
        -DX_SERVER=\"$(bindir)/X\" \
        -DUDEVLIBEXECDIR=\""$(libexecdir)/udev"\" \
+        -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
        -I $(top_srcdir)/src \
        -I $(top_srcdir)/src/shared \
        -I $(top_srcdir)/src/readahead \
@@ -456,7 +457,9 @@ endif
 dist_doc_DATA = \
        README \
        NEWS \
-       LICENSE \
+       LICENSE.LGPL2.1 \
+        LICENSE.GPL2 \
+        LICENSE.MIT \
        DISTRO_PORTING
 
 pkgconfigdata_DATA = \
@@ -766,8 +769,7 @@ libsystemd_core_la_SOURCES = \
        src/core/ask-password-api.h \
        src/core/sysfs-show.h \
        src/core/polkit.h \
-       src/core/dbus-loop.h \
-       src/core/spawn-agent.h
+       src/core/dbus-loop.h
 
 nodist_libsystemd_core_la_SOURCES = \
        src/load-fragment-gperf.c \
@@ -1078,7 +1080,10 @@ systemctl_SOURCES = \
        src/cgroup-show.h \
        src/unit-name.c \
        src/install.c \
-       src/spawn-agent.c \
+       src/spawn-ask-password-agent.c \
+       src/spawn-ask-password-agent.h \
+       src/spawn-polkit-agent.c \
+       src/spawn-polkit-agent.h \
        src/logs-show.c \
        src/logs-show.h
 
@@ -1828,7 +1833,7 @@ dist_udevkeymapforcerel_DATA = \
        src/udev/keymap/force-release-maps/common-volume-keys
 
 src/udev/keymap/keys.txt: $(INCLUDE_PREFIX)/linux/input.h
-       $(AM_V_at)mkdir -p src/keymap
+       $(AM_V_at)mkdir -p src/udev/keymap
        $(AM_V_GEN)$(AWK) '/^#define.*KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' < $< | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
 
 src/udev/keymap/keys-from-name.gperf: src/udev/keymap/keys.txt
@@ -2589,6 +2594,8 @@ loginctl_SOURCES = \
        src/login/loginctl.c \
        src/login/sysfs-show.c \
        src/dbus-common.c \
+       src/spawn-polkit-agent.c \
+       src/spawn-polkit-agent.h \
        src/cgroup-show.c \
        src/cgroup-show.h