Attachment #344506 for bug #461940




	libsystemd-dbus.la \
	libsystemd-audit.la \
	libsystemd-id128-internal.la \
	libsystemd-daemon.la \
	libudev.la \
	$(LIBWRAP_LIBS) \
	$(PAM_LIBS) \


systemd_LDADD = \
	libsystemd-core.la \
	libsystemd-daemon.la \
	libsystemd-id128-internal.la \
	libsystemd-dbus.la



test_engine_LDADD = \
	libsystemd-core.la \
	libsystemd-daemon.la \
	libsystemd-dbus.la

test_job_type_SOURCES = \

	$(DBUS_CFLAGS)

test_job_type_LDADD = \
	libsystemd-core.la
	libsystemd-daemon.la

test_ns_SOURCES = \
	src/test/test-ns.c

	src/test/test-daemon.c

test_daemon_LDADD = \
	libsystemd-shared.la
	libsystemd-daemon.la

test_cgroup_SOURCES = \
	src/test/test-cgroup.c

	-D"STR(s)=\#s" -D"TEST_DIR=STR($(abs_top_srcdir)/test/)"

test_sched_prio_LDADD = \
	libsystemd-core.la
	libsystemd-daemon.la

# ------------------------------------------------------------------------------
systemd_initctl_SOURCES = \


systemd_initctl_LDADD = \
	libsystemd-shared.la \
	libsystemd-daemon.la \
	libsystemd-dbus.la

# ------------------------------------------------------------------------------


systemd_shutdownd_LDADD = \
	libsystemd-label.la \
	libsystemd-shared.la
	libsystemd-daemon.la

pkginclude_HEADERS += \
	src/systemd/sd-shutdown.h

	libsystemd-units.la \
	libsystemd-label.la \
	libsystemd-shared.la \
	libsystemd-daemon.la \
	libsystemd-dbus.la \
	libsystemd-logs.la


	src/readahead/sd-readahead.c

systemd_notify_LDADD = \
	libsystemd-shared.la
	libsystemd-daemon.la

# ------------------------------------------------------------------------------
systemd_ask_password_SOURCES = \

	libsystemd-label.la \
	libsystemd-capability.la \
	libsystemd-shared.la \
	libsystemd-daemon.la \
	libsystemd-id128-internal.la

# ------------------------------------------------------------------------------

INSTALL_EXEC_HOOKS += libsystemd-daemon-install-hook
UNINSTALL_EXEC_HOOKS += libsystemd-daemon-uninstall-hook

lib_LTLIBRARIES += 
	libsystemd-daemon.la

noinst_LTLIBRARIES += \
        libsystemd-daemon-internal.la

	src/activate/activate.c

systemd_activate_LDADD = \
	libsystemd-shared.la
	libsystemd-daemon.la

# ------------------------------------------------------------------------------
systemd_journald_SOURCES = \

libsystemd_journal_internal_la_LIBADD = \
	libsystemd-label.la \
	libsystemd-audit.la \
	libsystemd-daemon.la \
	libudev.la \
	libsystemd-shared.la \
	libsystemd-label.la

	libsystemd-logs.la \
	libsystemd-journal-internal.la \
	libsystemd-id128-internal.la \
	libsystemd-daemon.la \
	$(MICROHTTPD_LIBS)

systemd_journal_gatewayd_CFLAGS = \


systemd_readahead_LDADD = \
	libsystemd-shared.la \
	libsystemd-daemon.la \
	libudev.la

dist_doc_DATA += \

systemd_hostnamed_LDADD = \
	libsystemd-label.la \
	libsystemd-shared.la \
	libsystemd-daemon.la \
	libsystemd-dbus.la

rootlibexec_PROGRAMS += \

systemd_localed_LDADD = \
	libsystemd-label.la \
	libsystemd-shared.la \
	libsystemd-daemon.la \
	libsystemd-dbus.la

nodist_systemunit_DATA += \

systemd_timedated_LDADD = \
	libsystemd-label.la \
	libsystemd-shared.la \
	libsystemd-daemon.la \
	libsystemd-dbus.la

rootlibexec_PROGRAMS += \


bootctl_LDADD = \
	libsystemd-shared.la \
	libsystemd-id128.la
	libsystemd-daemon.la

bin_PROGRAMS += \
	bootctl

	libsystemd-label.la \
	libsystemd-shared.la \
	libsystemd-audit.la \
	libsystemd-daemon.la \
	libsystemd-dbus.la \
	libudev.la


	-export-symbols-regex '^pam_sm_.*'

pam_systemd_la_LIBADD = \
	libsystemd-daemon.la \
	libsystemd-audit.la \
	libsystemd-dbus.la \
	libsystemd-shared.la \

Return to bug 461940

Lines 912-918 Link Here

(-)Makefile.am.ori (-30 / +8 lines)
912	libsystemd-dbus.la \	912	libsystemd-dbus.la \
913	libsystemd-audit.la \	913	libsystemd-audit.la \
914	libsystemd-id128-internal.la \	914	libsystemd-id128-internal.la \
915	libsystemd-daemon.la \
916	libudev.la \	915	libudev.la \
917	$(LIBWRAP_LIBS) \	916	$(LIBWRAP_LIBS) \
918	$(PAM_LIBS) \	917	$(PAM_LIBS) \
Lines 964-970 Link Here
964		963
965	systemd_LDADD = \	964	systemd_LDADD = \
966	libsystemd-core.la \	965	libsystemd-core.la \
967	libsystemd-daemon.la \
968	libsystemd-id128-internal.la \	966	libsystemd-id128-internal.la \
969	libsystemd-dbus.la	967	libsystemd-dbus.la
970		968
Lines 1060-1066 Link Here
1060		1058
1061	test_engine_LDADD = \	1059	test_engine_LDADD = \
1062	libsystemd-core.la \	1060	libsystemd-core.la \
1063	libsystemd-daemon.la \
1064	libsystemd-dbus.la	1061	libsystemd-dbus.la
1065		1062
1066	test_job_type_SOURCES = \	1063	test_job_type_SOURCES = \
Lines 1071-1078 Link Here
1071	$(DBUS_CFLAGS)	1068	$(DBUS_CFLAGS)
1072		1069
1073	test_job_type_LDADD = \	1070	test_job_type_LDADD = \
1074	libsystemd-core.la \	1071	libsystemd-core.la
1075	libsystemd-daemon.la
1076		1072
1077	test_ns_SOURCES = \	1073	test_ns_SOURCES = \
1078	src/test/test-ns.c	1074	src/test/test-ns.c
Lines 1173-1180 Link Here
1173	src/test/test-daemon.c	1169	src/test/test-daemon.c
1174		1170
1175	test_daemon_LDADD = \	1171	test_daemon_LDADD = \
1176	libsystemd-shared.la \	1172	libsystemd-shared.la
1177	libsystemd-daemon.la
1178		1173
1179	test_cgroup_SOURCES = \	1174	test_cgroup_SOURCES = \
1180	src/test/test-cgroup.c	1175	src/test/test-cgroup.c
Lines 1243-1250 Link Here
1243	-D"STR(s)=\#s" -D"TEST_DIR=STR($(abs_top_srcdir)/test/)"	1238	-D"STR(s)=\#s" -D"TEST_DIR=STR($(abs_top_srcdir)/test/)"
1244		1239
1245	test_sched_prio_LDADD = \	1240	test_sched_prio_LDADD = \
1246	libsystemd-core.la \	1241	libsystemd-core.la
1247	libsystemd-daemon.la
1248		1242
1249	# ------------------------------------------------------------------------------	1243	# ------------------------------------------------------------------------------
1250	systemd_initctl_SOURCES = \	1244	systemd_initctl_SOURCES = \
Lines 1256-1262 Link Here
1256		1250
1257	systemd_initctl_LDADD = \	1251	systemd_initctl_LDADD = \
1258	libsystemd-shared.la \	1252	libsystemd-shared.la \
1259	libsystemd-daemon.la \
1260	libsystemd-dbus.la	1253	libsystemd-dbus.la
1261		1254
1262	# ------------------------------------------------------------------------------	1255	# ------------------------------------------------------------------------------
Lines 1279-1286 Link Here
1279		1272
1280	systemd_shutdownd_LDADD = \	1273	systemd_shutdownd_LDADD = \
1281	libsystemd-label.la \	1274	libsystemd-label.la \
1282	libsystemd-shared.la \	1275	libsystemd-shared.la
1283	libsystemd-daemon.la
1284		1276
1285	pkginclude_HEADERS += \	1277	pkginclude_HEADERS += \
1286	src/systemd/sd-shutdown.h	1278	src/systemd/sd-shutdown.h
Lines 1491-1497 Link Here
1491	libsystemd-units.la \	1483	libsystemd-units.la \
1492	libsystemd-label.la \	1484	libsystemd-label.la \
1493	libsystemd-shared.la \	1485	libsystemd-shared.la \
1494	libsystemd-daemon.la \
1495	libsystemd-dbus.la \	1486	libsystemd-dbus.la \
1496	libsystemd-logs.la	1487	libsystemd-logs.la
1497		1488
Lines 1501-1508 Link Here
1501	src/readahead/sd-readahead.c	1492	src/readahead/sd-readahead.c
1502		1493
1503	systemd_notify_LDADD = \	1494	systemd_notify_LDADD = \
1504	libsystemd-shared.la \	1495	libsystemd-shared.la
1505	libsystemd-daemon.la
1506		1496
1507	# ------------------------------------------------------------------------------	1497	# ------------------------------------------------------------------------------
1508	systemd_ask_password_SOURCES = \	1498	systemd_ask_password_SOURCES = \
Lines 1545-1551 Link Here
1545	libsystemd-label.la \	1535	libsystemd-label.la \
1546	libsystemd-capability.la \	1536	libsystemd-capability.la \
1547	libsystemd-shared.la \	1537	libsystemd-shared.la \
1548	libsystemd-daemon.la \
1549	libsystemd-id128-internal.la	1538	libsystemd-id128-internal.la
1550		1539
1551	# ------------------------------------------------------------------------------	1540	# ------------------------------------------------------------------------------
Lines 1593-1600 Link Here
1593	INSTALL_EXEC_HOOKS += libsystemd-daemon-install-hook	1582	INSTALL_EXEC_HOOKS += libsystemd-daemon-install-hook
1594	UNINSTALL_EXEC_HOOKS += libsystemd-daemon-uninstall-hook	1583	UNINSTALL_EXEC_HOOKS += libsystemd-daemon-uninstall-hook
1595		1584
1596	lib_LTLIBRARIES += \	1585	lib_LTLIBRARIES +=
1597	libsystemd-daemon.la
1598		1586
1599	noinst_LTLIBRARIES += \	1587	noinst_LTLIBRARIES += \
1600	libsystemd-daemon-internal.la	1588	libsystemd-daemon-internal.la
Lines 2331-2338 Link Here
2331	src/activate/activate.c	2319	src/activate/activate.c
2332		2320
2333	systemd_activate_LDADD = \	2321	systemd_activate_LDADD = \
2334	libsystemd-shared.la \	2322	libsystemd-shared.la
2335	libsystemd-daemon.la
2336		2323
2337	# ------------------------------------------------------------------------------	2324	# ------------------------------------------------------------------------------
2338	systemd_journald_SOURCES = \	2325	systemd_journald_SOURCES = \
Lines 2505-2511 Link Here
2505	libsystemd_journal_internal_la_LIBADD = \	2492	libsystemd_journal_internal_la_LIBADD = \
2506	libsystemd-label.la \	2493	libsystemd-label.la \
2507	libsystemd-audit.la \	2494	libsystemd-audit.la \
2508	libsystemd-daemon.la \
2509	libudev.la \	2495	libudev.la \
2510	libsystemd-shared.la \	2496	libsystemd-shared.la \
2511	libsystemd-label.la	2497	libsystemd-label.la
Lines 2677-2683 Link Here
2677	libsystemd-logs.la \	2663	libsystemd-logs.la \
2678	libsystemd-journal-internal.la \	2664	libsystemd-journal-internal.la \
2679	libsystemd-id128-internal.la \	2665	libsystemd-id128-internal.la \
2680	libsystemd-daemon.la \
2681	$(MICROHTTPD_LIBS)	2666	$(MICROHTTPD_LIBS)
2682		2667
2683	systemd_journal_gatewayd_CFLAGS = \	2668	systemd_journal_gatewayd_CFLAGS = \
Lines 2804-2810 Link Here
2804		2789
2805	systemd_readahead_LDADD = \	2790	systemd_readahead_LDADD = \
2806	libsystemd-shared.la \	2791	libsystemd-shared.la \
2807	libsystemd-daemon.la \
2808	libudev.la	2792	libudev.la
2809		2793
2810	dist_doc_DATA += \	2794	dist_doc_DATA += \
Lines 2944-2950 Link Here
2944	systemd_hostnamed_LDADD = \	2928	systemd_hostnamed_LDADD = \
2945	libsystemd-label.la \	2929	libsystemd-label.la \
2946	libsystemd-shared.la \	2930	libsystemd-shared.la \
2947	libsystemd-daemon.la \
2948	libsystemd-dbus.la	2931	libsystemd-dbus.la
2949		2932
2950	rootlibexec_PROGRAMS += \	2933	rootlibexec_PROGRAMS += \
Lines 3011-3017 Link Here
3011	systemd_localed_LDADD = \	2994	systemd_localed_LDADD = \
3012	libsystemd-label.la \	2995	libsystemd-label.la \
3013	libsystemd-shared.la \	2996	libsystemd-shared.la \
3014	libsystemd-daemon.la \
3015	libsystemd-dbus.la	2997	libsystemd-dbus.la
3016		2998
3017	nodist_systemunit_DATA += \	2999	nodist_systemunit_DATA += \
Lines 3087-3093 Link Here
3087	systemd_timedated_LDADD = \	3069	systemd_timedated_LDADD = \
3088	libsystemd-label.la \	3070	libsystemd-label.la \
3089	libsystemd-shared.la \	3071	libsystemd-shared.la \
3090	libsystemd-daemon.la \
3091	libsystemd-dbus.la	3072	libsystemd-dbus.la
3092		3073
3093	rootlibexec_PROGRAMS += \	3074	rootlibexec_PROGRAMS += \
Lines 3155-3162 Link Here
3155		3136
3156	bootctl_LDADD = \	3137	bootctl_LDADD = \
3157	libsystemd-shared.la \	3138	libsystemd-shared.la \
3158	libsystemd-id128.la \	3139	libsystemd-id128.la
3159	libsystemd-daemon.la
3160		3140
3161	bin_PROGRAMS += \	3141	bin_PROGRAMS += \
3162	bootctl	3142	bootctl
Lines 3220-3226 Link Here
3220	libsystemd-label.la \	3200	libsystemd-label.la \
3221	libsystemd-shared.la \	3201	libsystemd-shared.la \
3222	libsystemd-audit.la \	3202	libsystemd-audit.la \
3223	libsystemd-daemon.la \
3224	libsystemd-dbus.la \	3203	libsystemd-dbus.la \
3225	libudev.la	3204	libudev.la
3226		3205
Lines 3334-3340 Link Here
3334	-export-symbols-regex '^pam_sm_.*'	3313	-export-symbols-regex '^pam_sm_.*'
3335		3314
3336	pam_systemd_la_LIBADD = \	3315	pam_systemd_la_LIBADD = \
3337	libsystemd-daemon.la \
3338	libsystemd-audit.la \	3316	libsystemd-audit.la \
3339	libsystemd-dbus.la \	3317	libsystemd-dbus.la \
3340	libsystemd-shared.la \	3318	libsystemd-shared.la \