Move client/auditclient/* files to client/client. Only leave LD_AUDIT…

… specific files in client/auditclient

src/client/Makefile.am

@@ -1 +1 @@
-SUBDIRS = logging biter shm_cache client_comlib auditclient beboot spindle_api
+SUBDIRS = logging biter shm_cache client_comlib client auditclient beboot spindle_api

src/client/Makefile.in

@@ -233,7 +233,7 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = logging biter shm_cache client_comlib auditclient beboot spindle_api
+SUBDIRS = logging biter shm_cache client_comlib client auditclient beboot spindle_api
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 

src/client/auditclient/Makefile.am

@@ -1,33 +1,34 @@
 pkglibexec_LTLIBRARIES = 
 
 if SOCKETS
-pkglibexec_LTLIBRARIES += libspindle_client_socket.la
+pkglibexec_LTLIBRARIES += libspindle_audit_socket.la
 endif
 if PIPES
-pkglibexec_LTLIBRARIES += libspindle_client_pipe.la
+pkglibexec_LTLIBRARIES += libspindle_audit_pipe.la
 endif
 if BITER
-pkglibexec_LTLIBRARIES += libspindle_client_biter.la
+pkglibexec_LTLIBRARIES += libspindle_audit_biter.la
 endif
 
-AM_CPPFLAGS = -I$(top_srcdir)/../logging -I$(top_srcdir)/client_comlib -I$(top_srcdir)/../include -I$(top_srcdir)/shm_cache
+AM_CPPFLAGS = -I$(top_srcdir)/../logging -I$(top_srcdir)/../include -I$(top_srcdir)/client -I$(top_srcdir)/client_comlib
 
-BASE_SOURCES = client.c auditclient.c intercept_open.c intercept_exec.c intercept_stat.c intercept_spindleapi.c patch_linkmap.c should_intercept.c exec_util.c remap_exec.c $(top_srcdir)/../utils/parseloc.c
+BASE_SRCS = auditclient.c patch_linkmap.c
 if X86_64_BLD
-ARCH_SOURCES = auditclient_x86_64.c
+ARCH_SRCS = auditclient_x86_64.c
 endif
 if PPC64_BLD
-ARCH_SOURCES = auditclient_ppc64.c
+ARCH_SRCS = auditclient_ppc64.c
 endif
 
-libspindle_client_socket_la_SOURCES = $(BASE_SOURCES) $(ARCH_SOURCES)
-libspindle_client_socket_la_LIBADD = $(top_builddir)/client_comlib/libclient_socket.la $(top_builddir)/logging/libspindlelogc.la $(top_builddir)/shm_cache/libshmcache.la
-libspindle_client_socket_la_LDFLAGS = -shared -avoid-version
+# $(top_builddir)/logging/libspindlelogc.la $(top_builddir)/shm_cache/libshmcache.la
+libspindle_audit_socket_la_SOURCES = $(BASE_SRCS) $(ARCH_SRCS)
+libspindle_audit_socket_la_LIBADD = $(top_builddir)/client/libspindlec_socket.la
+libspindle_audit_socket_la_LDFLAGS = -shared -avoid-version
 
-libspindle_client_pipe_la_SOURCES = $(BASE_SOURCES) $(ARCH_SOURCES)
-libspindle_client_pipe_la_LIBADD = $(top_builddir)/client_comlib/libclient_pipe.la $(top_builddir)/logging/libspindlelogc.la $(top_builddir)/shm_cache/libshmcache.la
-libspindle_client_pipe_la_LDFLAGS = -shared -avoid-version
+libspindle_audit_pipe_la_SOURCES = $(BASE_SRCS) $(ARCH_SRCS)
+libspindle_audit_pipe_la_LIBADD = $(top_builddir)/client/libspindlec_pipe.la
+libspindle_audit_pipe_la_LDFLAGS = -shared -avoid-version
 
-libspindle_client_biter_la_SOURCES = $(BASE_SOURCES) $(ARCH_SOURCES)
-libspindle_client_biter_la_LIBADD = $(top_builddir)/client_comlib/libclient_biter.la $(top_builddir)/logging/libspindlelogc.la $(top_builddir)/shm_cache/libshmcache.la
-libspindle_client_biter_la_LDFLAGS = -shared -avoid-version
+libspindle_audit_biter_la_SOURCES = $(BASE_SRCS) $(ARCH_SRCS)
+libspindle_audit_biter_la_LIBADD = $(top_builddir)/client/libspindlec_biter.la
+libspindle_audit_biter_la_LDFLAGS = -shared -avoid-version

src/client/auditclient/Makefile.in

@@ -35,9 +35,9 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-@SOCKETS_TRUE@am__append_1 = libspindle_client_socket.la
-@PIPES_TRUE@am__append_2 = libspindle_client_pipe.la
-@BITER_TRUE@am__append_3 = libspindle_client_biter.la
+@SOCKETS_TRUE@am__append_1 = libspindle_audit_socket.la
+@PIPES_TRUE@am__append_2 = libspindle_audit_pipe.la
+@BITER_TRUE@am__append_3 = libspindle_audit_biter.la
 subdir = auditclient
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -73,72 +73,54 @@ am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(pkglibexecdir)"
 LTLIBRARIES = $(pkglibexec_LTLIBRARIES)
-libspindle_client_biter_la_DEPENDENCIES =  \
-	$(top_builddir)/client_comlib/libclient_biter.la \
-	$(top_builddir)/logging/libspindlelogc.la \
-	$(top_builddir)/shm_cache/libshmcache.la
-am__libspindle_client_biter_la_SOURCES_DIST = client.c auditclient.c \
-	intercept_open.c intercept_exec.c intercept_stat.c \
-	intercept_spindleapi.c patch_linkmap.c should_intercept.c \
-	exec_util.c remap_exec.c $(top_srcdir)/../utils/parseloc.c \
-	auditclient_ppc64.c auditclient_x86_64.c
-am__objects_1 = client.lo auditclient.lo intercept_open.lo \
-	intercept_exec.lo intercept_stat.lo intercept_spindleapi.lo \
-	patch_linkmap.lo should_intercept.lo exec_util.lo \
-	remap_exec.lo parseloc.lo
+libspindle_audit_biter_la_DEPENDENCIES =  \
+	$(top_builddir)/client/libspindlec_biter.la
+am__libspindle_audit_biter_la_SOURCES_DIST = auditclient.c \
+	patch_linkmap.c auditclient_ppc64.c auditclient_x86_64.c
+am__objects_1 = auditclient.lo patch_linkmap.lo
 @PPC64_BLD_FALSE@@X86_64_BLD_TRUE@am__objects_2 =  \
 @PPC64_BLD_FALSE@@X86_64_BLD_TRUE@	auditclient_x86_64.lo
 @PPC64_BLD_TRUE@am__objects_2 = auditclient_ppc64.lo
-am_libspindle_client_biter_la_OBJECTS = $(am__objects_1) \
+am_libspindle_audit_biter_la_OBJECTS = $(am__objects_1) \
 	$(am__objects_2)
-libspindle_client_biter_la_OBJECTS =  \
-	$(am_libspindle_client_biter_la_OBJECTS)
+libspindle_audit_biter_la_OBJECTS =  \
+	$(am_libspindle_audit_biter_la_OBJECTS)
 AM_V_lt = $(am__v_lt_$(V))
 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
 am__v_lt_0 = --silent
-libspindle_client_biter_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+libspindle_audit_biter_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(libspindle_client_biter_la_LDFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS) $(libspindle_audit_biter_la_LDFLAGS) \
 	$(LDFLAGS) -o $@
-@BITER_TRUE@am_libspindle_client_biter_la_rpath = -rpath \
+@BITER_TRUE@am_libspindle_audit_biter_la_rpath = -rpath \
 @BITER_TRUE@	$(pkglibexecdir)
-libspindle_client_pipe_la_DEPENDENCIES =  \
-	$(top_builddir)/client_comlib/libclient_pipe.la \
-	$(top_builddir)/logging/libspindlelogc.la \
-	$(top_builddir)/shm_cache/libshmcache.la
-am__libspindle_client_pipe_la_SOURCES_DIST = client.c auditclient.c \
-	intercept_open.c intercept_exec.c intercept_stat.c \
-	intercept_spindleapi.c patch_linkmap.c should_intercept.c \
-	exec_util.c remap_exec.c $(top_srcdir)/../utils/parseloc.c \
-	auditclient_ppc64.c auditclient_x86_64.c
-am_libspindle_client_pipe_la_OBJECTS = $(am__objects_1) \
+libspindle_audit_pipe_la_DEPENDENCIES =  \
+	$(top_builddir)/client/libspindlec_pipe.la
+am__libspindle_audit_pipe_la_SOURCES_DIST = auditclient.c \
+	patch_linkmap.c auditclient_ppc64.c auditclient_x86_64.c
+am_libspindle_audit_pipe_la_OBJECTS = $(am__objects_1) \
 	$(am__objects_2)
-libspindle_client_pipe_la_OBJECTS =  \
-	$(am_libspindle_client_pipe_la_OBJECTS)
-libspindle_client_pipe_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+libspindle_audit_pipe_la_OBJECTS =  \
+	$(am_libspindle_audit_pipe_la_OBJECTS)
+libspindle_audit_pipe_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(libspindle_client_pipe_la_LDFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS) $(libspindle_audit_pipe_la_LDFLAGS) \
 	$(LDFLAGS) -o $@
-@PIPES_TRUE@am_libspindle_client_pipe_la_rpath = -rpath \
+@PIPES_TRUE@am_libspindle_audit_pipe_la_rpath = -rpath \
 @PIPES_TRUE@	$(pkglibexecdir)
-libspindle_client_socket_la_DEPENDENCIES =  \
-	$(top_builddir)/client_comlib/libclient_socket.la \
-	$(top_builddir)/logging/libspindlelogc.la \
-	$(top_builddir)/shm_cache/libshmcache.la
-am__libspindle_client_socket_la_SOURCES_DIST = client.c auditclient.c \
-	intercept_open.c intercept_exec.c intercept_stat.c \
-	intercept_spindleapi.c patch_linkmap.c should_intercept.c \
-	exec_util.c remap_exec.c $(top_srcdir)/../utils/parseloc.c \
-	auditclient_ppc64.c auditclient_x86_64.c
-am_libspindle_client_socket_la_OBJECTS = $(am__objects_1) \
+libspindle_audit_socket_la_DEPENDENCIES =  \
+	$(top_builddir)/client/libspindlec_socket.la
+am__libspindle_audit_socket_la_SOURCES_DIST = auditclient.c \
+	patch_linkmap.c auditclient_ppc64.c auditclient_x86_64.c
+am_libspindle_audit_socket_la_OBJECTS = $(am__objects_1) \
 	$(am__objects_2)
-libspindle_client_socket_la_OBJECTS =  \
-	$(am_libspindle_client_socket_la_OBJECTS)
-libspindle_client_socket_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+libspindle_audit_socket_la_OBJECTS =  \
+	$(am_libspindle_audit_socket_la_OBJECTS)
+libspindle_audit_socket_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(libspindle_client_socket_la_LDFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS) $(libspindle_audit_socket_la_LDFLAGS) \
 	$(LDFLAGS) -o $@
-@SOCKETS_TRUE@am_libspindle_client_socket_la_rpath = -rpath \
+@SOCKETS_TRUE@am_libspindle_audit_socket_la_rpath = -rpath \
 @SOCKETS_TRUE@	$(pkglibexecdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/../../scripts/depcomp
@@ -166,12 +148,12 @@ am__v_CCLD_0 = @echo "  CCLD  " $@;
 AM_V_GEN = $(am__v_GEN_$(V))
 am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
 am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(libspindle_client_biter_la_SOURCES) \
-	$(libspindle_client_pipe_la_SOURCES) \
-	$(libspindle_client_socket_la_SOURCES)
-DIST_SOURCES = $(am__libspindle_client_biter_la_SOURCES_DIST) \
-	$(am__libspindle_client_pipe_la_SOURCES_DIST) \
-	$(am__libspindle_client_socket_la_SOURCES_DIST)
+SOURCES = $(libspindle_audit_biter_la_SOURCES) \
+	$(libspindle_audit_pipe_la_SOURCES) \
+	$(libspindle_audit_socket_la_SOURCES)
+DIST_SOURCES = $(am__libspindle_audit_biter_la_SOURCES_DIST) \
+	$(am__libspindle_audit_pipe_la_SOURCES_DIST) \
+	$(am__libspindle_audit_socket_la_SOURCES_DIST)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -293,19 +275,21 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 pkglibexec_LTLIBRARIES = $(am__append_1) $(am__append_2) \
 	$(am__append_3)
-AM_CPPFLAGS = -I$(top_srcdir)/../logging -I$(top_srcdir)/client_comlib -I$(top_srcdir)/../include -I$(top_srcdir)/shm_cache
-BASE_SOURCES = client.c auditclient.c intercept_open.c intercept_exec.c intercept_stat.c intercept_spindleapi.c patch_linkmap.c should_intercept.c exec_util.c remap_exec.c $(top_srcdir)/../utils/parseloc.c
-@PPC64_BLD_TRUE@ARCH_SOURCES = auditclient_ppc64.c
-@X86_64_BLD_TRUE@ARCH_SOURCES = auditclient_x86_64.c
-libspindle_client_socket_la_SOURCES = $(BASE_SOURCES) $(ARCH_SOURCES)
-libspindle_client_socket_la_LIBADD = $(top_builddir)/client_comlib/libclient_socket.la $(top_builddir)/logging/libspindlelogc.la $(top_builddir)/shm_cache/libshmcache.la
-libspindle_client_socket_la_LDFLAGS = -shared -avoid-version
-libspindle_client_pipe_la_SOURCES = $(BASE_SOURCES) $(ARCH_SOURCES)
-libspindle_client_pipe_la_LIBADD = $(top_builddir)/client_comlib/libclient_pipe.la $(top_builddir)/logging/libspindlelogc.la $(top_builddir)/shm_cache/libshmcache.la
-libspindle_client_pipe_la_LDFLAGS = -shared -avoid-version
-libspindle_client_biter_la_SOURCES = $(BASE_SOURCES) $(ARCH_SOURCES)
-libspindle_client_biter_la_LIBADD = $(top_builddir)/client_comlib/libclient_biter.la $(top_builddir)/logging/libspindlelogc.la $(top_builddir)/shm_cache/libshmcache.la
-libspindle_client_biter_la_LDFLAGS = -shared -avoid-version
+AM_CPPFLAGS = -I$(top_srcdir)/../logging -I$(top_srcdir)/../include -I$(top_srcdir)/client -I$(top_srcdir)/client_comlib
+BASE_SRCS = auditclient.c patch_linkmap.c
+@PPC64_BLD_TRUE@ARCH_SRCS = auditclient_ppc64.c
+@X86_64_BLD_TRUE@ARCH_SRCS = auditclient_x86_64.c
+
+# $(top_builddir)/logging/libspindlelogc.la $(top_builddir)/shm_cache/libshmcache.la
+libspindle_audit_socket_la_SOURCES = $(BASE_SRCS) $(ARCH_SRCS)
+libspindle_audit_socket_la_LIBADD = $(top_builddir)/client/libspindlec_socket.la
+libspindle_audit_socket_la_LDFLAGS = -shared -avoid-version
+libspindle_audit_pipe_la_SOURCES = $(BASE_SRCS) $(ARCH_SRCS)
+libspindle_audit_pipe_la_LIBADD = $(top_builddir)/client/libspindlec_pipe.la
+libspindle_audit_pipe_la_LDFLAGS = -shared -avoid-version
+libspindle_audit_biter_la_SOURCES = $(BASE_SRCS) $(ARCH_SRCS)
+libspindle_audit_biter_la_LIBADD = $(top_builddir)/client/libspindlec_biter.la
+libspindle_audit_biter_la_LDFLAGS = -shared -avoid-version
 all: all-am
 
 .SUFFIXES:
@@ -371,12 +355,12 @@ clean-pkglibexecLTLIBRARIES:
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libspindle_client_biter.la: $(libspindle_client_biter_la_OBJECTS) $(libspindle_client_biter_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(libspindle_client_biter_la_LINK) $(am_libspindle_client_biter_la_rpath) $(libspindle_client_biter_la_OBJECTS) $(libspindle_client_biter_la_LIBADD) $(LIBS)
-libspindle_client_pipe.la: $(libspindle_client_pipe_la_OBJECTS) $(libspindle_client_pipe_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(libspindle_client_pipe_la_LINK) $(am_libspindle_client_pipe_la_rpath) $(libspindle_client_pipe_la_OBJECTS) $(libspindle_client_pipe_la_LIBADD) $(LIBS)
-libspindle_client_socket.la: $(libspindle_client_socket_la_OBJECTS) $(libspindle_client_socket_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(libspindle_client_socket_la_LINK) $(am_libspindle_client_socket_la_rpath) $(libspindle_client_socket_la_OBJECTS) $(libspindle_client_socket_la_LIBADD) $(LIBS)
+libspindle_audit_biter.la: $(libspindle_audit_biter_la_OBJECTS) $(libspindle_audit_biter_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libspindle_audit_biter_la_LINK) $(am_libspindle_audit_biter_la_rpath) $(libspindle_audit_biter_la_OBJECTS) $(libspindle_audit_biter_la_LIBADD) $(LIBS)
+libspindle_audit_pipe.la: $(libspindle_audit_pipe_la_OBJECTS) $(libspindle_audit_pipe_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libspindle_audit_pipe_la_LINK) $(am_libspindle_audit_pipe_la_rpath) $(libspindle_audit_pipe_la_OBJECTS) $(libspindle_audit_pipe_la_LIBADD) $(LIBS)
+libspindle_audit_socket.la: $(libspindle_audit_socket_la_OBJECTS) $(libspindle_audit_socket_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libspindle_audit_socket_la_LINK) $(am_libspindle_audit_socket_la_rpath) $(libspindle_audit_socket_la_OBJECTS) $(libspindle_audit_socket_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -387,16 +371,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auditclient.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auditclient_ppc64.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auditclient_x86_64.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/client.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exec_util.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/intercept_exec.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/intercept_open.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/intercept_spindleapi.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/intercept_stat.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parseloc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/patch_linkmap.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remap_exec.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/should_intercept.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -422,14 +397,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
-parseloc.lo: $(top_srcdir)/../utils/parseloc.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT parseloc.lo -MD -MP -MF $(DEPDIR)/parseloc.Tpo -c -o parseloc.lo `test -f '$(top_srcdir)/../utils/parseloc.c' || echo '$(srcdir)/'`$(top_srcdir)/../utils/parseloc.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/parseloc.Tpo $(DEPDIR)/parseloc.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/../utils/parseloc.c' object='parseloc.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o parseloc.lo `test -f '$(top_srcdir)/../utils/parseloc.c' || echo '$(srcdir)/'`$(top_srcdir)/../utils/parseloc.c
-
 mostlyclean-libtool:
 	-rm -f *.lo
 

src/client/beboot/Makefile.am

@@ -1,9 +1,9 @@
 pkglibexec_PROGRAMS = spindle_bootstrap
 
 spindle_bootstrap_LDFLAGS = -all-static $(AM_LDFLAGS)
-spindle_bootstrap_CPPFLAGS = $(AM_CPPFLAGS) -DLIBEXECDIR=\"$(pkglibexecdir)\" -I$(top_srcdir)/../include -I$(top_srcdir)/../logging -I$(top_srcdir)/client_comlib -I$(top_srcdir)/auditclient
+spindle_bootstrap_CPPFLAGS = $(AM_CPPFLAGS) -DLIBEXECDIR=\"$(pkglibexecdir)\" -I$(top_srcdir)/../include -I$(top_srcdir)/../logging -I$(top_srcdir)/client_comlib -I$(top_srcdir)/client
 spindle_bootstrap_LDADD = $(top_builddir)/logging/libspindlelogc.la 
-spindle_bootstrap_SOURCES = spindle_bootstrap.c $(top_srcdir)/../utils/parseloc.c $(top_srcdir)/../utils/spindle_mkdir.c $(top_srcdir)/auditclient/exec_util.c
+spindle_bootstrap_SOURCES = spindle_bootstrap.c $(top_srcdir)/../utils/parseloc.c $(top_srcdir)/../utils/spindle_mkdir.c $(top_srcdir)/client/exec_util.c
 
 if PIPES
 spindle_bootstrap_LDADD += $(top_builddir)/client_comlib/libclient_pipe.la