fix build with all library soruce in src/

diff --git a/Makefile.am b/Makefile.am
index f34379b..f549113 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = data polkit polkit-dbus polkit-grant polkitd doc tools policy po test
+SUBDIRS = data src polkitd doc tools policy po test
 
 # Creating ChangeLog from git log (taken from cairo/Makefile.am):
 ChangeLog: $(srcdir)/ChangeLog
@@ -22,8 +22,8 @@ $(srcdir)/ChangeLog:
 if POLKIT_GCOV_ENABLED
 .PHONY: ChangeLog $(srcdir)/ChangeLog coverage-report.txt
 coverage-report.txt :
-       make -C polkit check-coverage
-       cat polkit/coverage-report.txt > coverage-report.txt
+       make -C src/polkit check-coverage
+       cat src/polkit/coverage-report.txt > coverage-report.txt
 
 check-coverage: coverage-report.txt
        cat coverage-report.txt

diff --git a/configure.in b/configure.in
index 4490a31..22004f2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -453,9 +453,10 @@ data/polkit
 data/polkit.pc
 data/polkit-dbus.pc
 data/polkit-grant.pc
-polkit/Makefile
-polkit-dbus/Makefile
-polkit-grant/Makefile
+src/Makefile
+src/polkit/Makefile
+src/polkit-dbus/Makefile
+src/polkit-grant/Makefile
 polkitd/Makefile
 tools/Makefile
 doc/Makefile

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 6fd8c06..02b4b24 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -16,11 +16,11 @@ DOC_MAIN_SGML_FILE=polkit-docs.xml
 SCAN_OPTIONS=--ignore-headers=config.h
 
 # The directory containing the source code. Relative to $(srcdir)
-DOC_SOURCE_DIR=..
+DOC_SOURCE_DIR=../src
 
 # Used for dependencies
-HFILE_GLOB=$(top_srcdir)/polkit*/*.h
-CFILE_GLOB=$(top_srcdir)/polkit*/*.c
+HFILE_GLOB=$(top_srcdir)/src/polkit*/*.h
+CFILE_GLOB=$(top_srcdir)/src/polkit*/*.c
 
 # Headers to ignore
 IGNORE_HFILES= \
@@ -31,14 +31,14 @@ IGNORE_HFILES= \
 INCLUDES = \
        $(DBUS_GLIB_CFLAGS)     \
        $(GLIB_CFLAGS)          \
-       -I$(top_srcdir)         \
-       -I$(top_builddir)       \
+       -I$(top_srcdir)/src     \
+       -I$(top_builddir)/src   \
        $(NULL)
 
 GTKDOC_LIBS = \
        $(DBUS_GLIB_LIBS)                       \
        $(GLIB_LIBS)                            \
-       $(top_builddir)/polkit/libpolkit.la     \
+       $(top_builddir)/src/polkit/libpolkit.la \
        $(NULL)
 
 # Extra options to supply to gtkdoc-mkdb

diff --git a/polkitd/Makefile.am b/polkitd/Makefile.am
index 815e72a..f1a12a6 100644 (file)
--- a/polkitd/Makefile.am
+++ b/polkitd/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 INCLUDES = \
-       -I$(top_builddir) -I$(top_srcdir) \
+       -I$(top_builddir)/src -I$(top_srcdir)/src \
        -DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\" \
        -DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" \
        -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
@@ -28,7 +28,7 @@ polkitd_SOURCES =                                     \
        $(BUILT_SOURCES)
 
 polkitd_CPPFLAGS =                                     \
-       -I$(top_srcdir)                                 \
+       -I$(top_srcdir)/src                             \
        -DG_LOG_DOMAIN=\"polkitd\"                      \
        -DDATADIR=\""$(pkgdatadir)"\"                   \
        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
@@ -36,7 +36,7 @@ polkitd_CPPFLAGS =                                    \
        $(AM_CPPFLAGS)
 
 polkitd_LDADD =                                        \
-       $(DBUS_GLIB_LIBS) $(top_builddir)/polkit/libpolkit.la $(top_builddir)/polkit-dbus/libpolkit-dbus.la $(top_builddir)/polkit-grant/libpolkit-grant.la
+       $(DBUS_GLIB_LIBS) $(top_builddir)/src/polkit/libpolkit.la $(top_builddir)/src/polkit-dbus/libpolkit-dbus.la $(top_builddir)/src/polkit-grant/libpolkit-grant.la
 
 
 servicedir       = $(datadir)/dbus-1/system-services

diff --git a/src/polkit-dbus/Makefile.am b/src/polkit-dbus/Makefile.am
index 3c7fac1..e39d046 100644 (file)
--- a/src/polkit-dbus/Makefile.am
+++ b/src/polkit-dbus/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 INCLUDES = \
-       -I$(top_builddir) -I$(top_srcdir) \
+       -I$(top_builddir)/src -I$(top_srcdir)/src \
        -DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\" \
        -DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" \
        -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
@@ -23,7 +23,7 @@ libpolkit_dbusinclude_HEADERS =                               \
 libpolkit_dbus_la_SOURCES =                                    \
        polkit-dbus.h           polkit-dbus.c
 
-libpolkit_dbus_la_LIBADD = @DBUS_LIBS@ $(top_builddir)/polkit/libpolkit.la $(SELINUX_LIBS)
+libpolkit_dbus_la_LIBADD = @DBUS_LIBS@ $(top_builddir)/src/polkit/libpolkit.la $(SELINUX_LIBS)
 
 libpolkit_dbus_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
@@ -32,7 +32,7 @@ libexec_PROGRAMS = polkit-read-auth-helper
 
 polkit_read_auth_helper_SOURCES = polkit-read-auth-helper.c
 polkit_read_auth_helper_CFLAGS = @DBUS_CFLAGS@
-polkit_read_auth_helper_LDADD = $(top_builddir)/polkit/libpolkit.la $(top_builddir)/polkit-dbus/libpolkit-dbus.la
+polkit_read_auth_helper_LDADD = $(top_builddir)/src/polkit/libpolkit.la $(top_builddir)/src/polkit-dbus/libpolkit-dbus.la
 
 # polkit-read-auth-helper needs to be setgid $POLKIT_GROUP to be able
 # to read authorization files in /var/lib/PolicyKit and

diff --git a/src/polkit-grant/Makefile.am b/src/polkit-grant/Makefile.am
index 05a2ee5..ed7a5f7 100644 (file)
--- a/src/polkit-grant/Makefile.am
+++ b/src/polkit-grant/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 INCLUDES = \
-       -I$(top_builddir) -I$(top_srcdir) \
+       -I$(top_builddir)/src -I$(top_srcdir)/src \
        -DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\" \
        -DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" \
        -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
@@ -32,7 +32,7 @@ if POLKIT_AUTHDB_DEFAULT
 libpolkit_grant_la_SOURCES += polkit-authorization-db-write.c
 endif
 
-libpolkit_grant_la_LIBADD = @GLIB_LIBS@ @DBUS_LIBS@ $(top_builddir)/polkit/libpolkit.la
+libpolkit_grant_la_LIBADD = @GLIB_LIBS@ @DBUS_LIBS@ $(top_builddir)/src/polkit/libpolkit.la
 
 libpolkit_grant_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
@@ -44,18 +44,18 @@ if POLKIT_AUTHDB_DEFAULT
 libexec_PROGRAMS = polkit-grant-helper polkit-grant-helper-pam polkit-explicit-grant-helper polkit-revoke-helper 
 
 polkit_grant_helper_SOURCES = polkit-grant-helper.c
-polkit_grant_helper_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ $(top_builddir)/polkit/libpolkit.la $(top_builddir)/polkit-dbus/libpolkit-dbus.la $(top_builddir)/polkit-grant/libpolkit-grant.la
+polkit_grant_helper_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ $(top_builddir)/src/polkit/libpolkit.la $(top_builddir)/src/polkit-dbus/libpolkit-dbus.la $(top_builddir)/src/polkit-grant/libpolkit-grant.la
 
 polkit_grant_helper_pam_SOURCES = polkit-grant-helper-pam.c
 polkit_grant_helper_pam_LDADD = @AUTH_LIBS@
 
 polkit_explicit_grant_helper_SOURCES = polkit-explicit-grant-helper.c
 polkit_explicit_grant_helper_CFLAGS = @DBUS_CFLAGS@
-polkit_explicit_grant_helper_LDADD = $(top_builddir)/polkit/libpolkit.la $(top_builddir)/polkit-dbus/libpolkit-dbus.la $(top_builddir)/polkit-grant/libpolkit-grant.la
+polkit_explicit_grant_helper_LDADD = $(top_builddir)/src/polkit/libpolkit.la $(top_builddir)/src/polkit-dbus/libpolkit-dbus.la $(top_builddir)/src/polkit-grant/libpolkit-grant.la
 
 polkit_revoke_helper_SOURCES = polkit-revoke-helper.c
 polkit_revoke_helper_CFLAGS = @DBUS_CFLAGS@
-polkit_revoke_helper_LDADD = $(top_builddir)/polkit/libpolkit.la $(top_builddir)/polkit-dbus/libpolkit-dbus.la
+polkit_revoke_helper_LDADD = $(top_builddir)/src/polkit/libpolkit.la $(top_builddir)/src/polkit-dbus/libpolkit-dbus.la
 
 # polkit-grant-helper needs to be setgid polkituser to be able to
 # write cookies to /var/lib/PolicyKit and /var/run/PolicyKit

diff --git a/src/polkit/Makefile.am b/src/polkit/Makefile.am
index c15017f..17f0b61 100644 (file)
--- a/src/polkit/Makefile.am
+++ b/src/polkit/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 INCLUDES = \
-       -I$(top_builddir) -I$(top_srcdir) \
+       -I$(top_builddir)/src -I$(top_srcdir)/src \
        -DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\" \
        -DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" \
        -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
@@ -117,7 +117,7 @@ noinst_PROGRAMS=$(TESTS)
 polkit_test_SOURCES=                           \
        polkit-test.h           polkit-test.c
 
-polkit_test_LDADD=$(top_builddir)/polkit/libpolkit.la
+polkit_test_LDADD=$(top_builddir)/src/polkit/libpolkit.la
 polkit_test_LDFLAGS=
 #@R_DYNAMIC_LDFLAG@
 

diff --git a/tools/Makefile.am b/tools/Makefile.am
index b7ed1de..faa0937 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 INCLUDES = \
-       -I$(top_builddir) -I$(top_srcdir) \
+       -I$(top_builddir)/src -I$(top_srcdir)/src \
        -DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\" \
        -DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" \
        -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
@@ -14,16 +14,16 @@ INCLUDES = \
 bin_PROGRAMS = polkit-config-file-validate polkit-policy-file-validate polkit-action polkit-auth
 
 polkit_config_file_validate_SOURCES = polkit-config-file-validate.c
-polkit_config_file_validate_LDADD = $(top_builddir)/polkit/libpolkit.la
+polkit_config_file_validate_LDADD = $(top_builddir)/src/polkit/libpolkit.la
 
 polkit_policy_file_validate_SOURCES = polkit-policy-file-validate.c
-polkit_policy_file_validate_LDADD = $(top_builddir)/polkit/libpolkit.la
+polkit_policy_file_validate_LDADD = $(top_builddir)/src/polkit/libpolkit.la
 
 polkit_auth_SOURCES = polkit-auth.c
-polkit_auth_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ $(top_builddir)/polkit/libpolkit.la $(top_builddir)/polkit-grant/libpolkit-grant.la $(top_builddir)/polkit-dbus/libpolkit-dbus.la
+polkit_auth_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ $(top_builddir)/src/polkit/libpolkit.la $(top_builddir)/src/polkit-grant/libpolkit-grant.la $(top_builddir)/src/polkit-dbus/libpolkit-dbus.la
 
 polkit_action_SOURCES = polkit-action.c
-polkit_action_LDADD = $(GLIB) $(top_builddir)/polkit/libpolkit.la
+polkit_action_LDADD = $(GLIB) $(top_builddir)/src/polkit/libpolkit.la
 
 profiledir = $(sysconfdir)/profile.d
 profile_SCRIPTS = polkit-bash-completion.sh