From 3e439de4e3773f26c7efc8d84a57cf2530883739 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 15 Sep 2016 01:31:03 -0400 Subject: stuff --- config.mk.in | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) (limited to 'config.mk.in') diff --git a/config.mk.in b/config.mk.in index 25d338215f..c1859a5cd2 100644 --- a/config.mk.in +++ b/config.mk.in @@ -108,6 +108,8 @@ libfirewall.CPPFLAGS = -I$(topsrcdir)/src/libfirewall libfirewall.DEPENDS = $(topoutdir)/src/libfirewall/libfirewall.la libshared.CPPFLAGS = -I$(topsrcdir)/src/libshared/include $(libsystemd-internal.CPPFLAGS) -I$(topsrcdir)/src/libudev/src libshared.DEPENDS = $(topoutdir)/src/libshared/src/libshared.la +libsystemd-shared.CPPFLAGS = +libsystemd-shared.DEPENDS = libsystemd-internal.CPPFLAGS = -I$(topsrcdir)/src/libsystemd/src -I$(topoutdir)/src/libsystemd/src $(libsystemd.CPPFLAGS) $(libbasic.CPPFLAGS) libsystemd-internal.DEPENDS = $(topoutdir)/src/libsystemd/src/libsystemd-internal.la @@ -149,28 +151,28 @@ libnss_resolve.DEPENDS = # Libraries we use HAVE_ACL = @HAVE_ACL_TRUE@1 - ACL_CFLAGS = #XXX + ACL_CFLAGS =#HARDCODED ACL_LIBS = @ACL_LIBS@ HAVE_APPARMOR = @HAVE_APPARMOR_TRUE@1 APPARMOR_CFLAGS = @APPARMOR_CFLAGS@ APPARMOR_LIBS = @APPARMOR_LIBS@ HAVE_AUDIT = @HAVE_AUDIT_TRUE@1 - AUDIT_CFLAGS = #XXX + AUDIT_CFLAGS =#HARDCODED AUDIT_LIBS = @AUDIT_LIBS@ HAVE_BLKID = @HAVE_BLKID_TRUE@1 BLKID_CFLAGS = @BLKID_CFLAGS@ BLKID_LIBS = @BLKID_LIBS@ HAVE_BZIP2 = @HAVE_BZIP2_TRUE@1 - BZIP2_CFLAGS = #XXX - BZIP2_LIBS = -lbz2 #XXX -HAVE_CAP = 1 #XXX - CAP_CFLAGS = #XXX + BZIP2_CFLAGS =#HARDCODED + BZIP2_LIBS = -lbz2#HARDCODED +HAVE_CAP = 1#HARDCODED + CAP_CFLAGS =#HARDCODED CAP_LIBS = @CAP_LIBS@ HAVE_DBUS = @HAVE_DBUS_TRUE@1 DBUS_CFLAGS = @DBUS_CFLAGS@ DBUS_LIBS = @DBUS_LIBS@ HAVE_ELFUTILS = @HAVE_ELFUTILS_TRUE@1 - ELFUTILS_CFLAGS = #XXX + ELFUTILS_CFLAGS =#HARDCODED ELFUTILS_LIBS = @ELFUTILS_LIBS@ HAVE_GCRYPT = @HAVE_GCRYPT_TRUE@1 GCRYPT_CFLAGS = @GCRYPT_CFLAGS@ @@ -178,12 +180,6 @@ HAVE_GCRYPT = @HAVE_GCRYPT_TRUE@1 HAVE_GNUTLS = @HAVE_GNUTLS_TRUE@1 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ GNUTLS_LIBS = @GNUTLS_LIBS@ -HAVE_GPG_ERROR = 1 #XXX - GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@ - GPG_ERROR_LIBS = @GPG_ERROR_LIBS@ -HAVE_GPG_ERROR_MT = 1 #XXX - GPG_ERROR_MT_CFLAGS = @GPG_ERROR_MT_CFLAGS@ - GPG_ERROR_MT_LIBS = @GPG_ERROR_MT_LIBS@ HAVE_KMOD = @HAVE_KMOD_TRUE@1 KMOD_CFLAGS = @KMOD_CFLAGS@ KMOD_LIBS = @KMOD_LIBS@ @@ -193,9 +189,6 @@ HAVE_LIBCRYPTSETUP = @HAVE_LIBCRYPTSETUP_TRUE@1 HAVE_LIBCURL = @HAVE_LIBCURL_TRUE@1 LIBCURL_CFLAGS = @LIBCURL_CFLAGS@ LIBCURL_LIBS = @LIBCURL_LIBS@ -HAVE_LIBGCRYPT = 1 #XXX - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ HAVE_LIBIDN = @HAVE_LIBIDN_TRUE@1 LIBIDN_CFLAGS = @LIBIDN_CFLAGS@ LIBIDN_LIBS = @LIBIDN_LIBS@ @@ -208,11 +201,11 @@ HAVE_LZ4 = @HAVE_LZ4_TRUE@1 HAVE_MICROHTTPD = @HAVE_MICROHTTPD_TRUE@1 MICROHTTPD_CFLAGS = @MICROHTTPD_CFLAGS@ MICROHTTPD_LIBS = @MICROHTTPD_LIBS@ -HAVE_MOUNT = 1 #XXX +HAVE_MOUNT = 1#HARDCODED MOUNT_CFLAGS = @MOUNT_CFLAGS@ MOUNT_LIBS = @MOUNT_LIBS@ HAVE_PAM = @HAVE_PAM_TRUE@1 - PAM_CFLAGS = #XXX + PAM_CFLAGS =#HARDCODED PAM_LIBS = @PAM_LIBS@ HAVE_QRENCODE = @HAVE_QRENCODE_TRUE@1 QRENCODE_CFLAGS = @QRENCODE_CFLAGS@ -- cgit v1.2.3-54-g00ecf