X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=src%2FMakefile.am;h=22879e3f110a1b817fbbf835442c838cffc074ea;hp=43f1b0d2b60f9b4976034fb915cbf25c067682d4;hb=21aac863e29eca5552c4ae1645306e966f11c1d8;hpb=2a9abc7791a12af07ec2dada4b3a9a16eb452dca

diff --git a/src/Makefile.am b/src/Makefile.am
index 43f1b0d..22879e3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,8 +22,8 @@ generator_built = \
 	guestfs-structs.h \
 	guestfs-actions.h \
 	guestfs-internal-actions.h \
-	guestfs-actions.c \
-	guestfs-bindtests.c \
+	actions.c \
+	bindtests.c \
 	guestfs-actions.pod \
 	guestfs-availability.pod \
 	guestfs-structs.pod \
@@ -121,14 +121,19 @@ libguestfs_la_SOURCES = \
 	guestfs.c \
 	guestfs.h \
 	guestfs-actions.h \
-	guestfs-actions.c \
-	guestfs-bindtests.c \
 	guestfs-internal.h \
+	guestfs-structs.h \
 	guestfs_protocol.h \
 	gettext.h \
+	actions.c \
+	appliance.c \
+	bindtests.c \
+	inspect.c \
+	launch.c \
+	proto.c \
 	libguestfs.syms
 
-libguestfs_la_LIBADD = $(LTLIBTHREAD) ../gnulib/lib/libgnu.la
+libguestfs_la_LIBADD = $(HIVEX_LIBS) $(LIBPCRE) $(LIBMAGIC) $(LTLIBTHREAD) ../gnulib/lib/libgnu.la
 
 # Make libguestfs include the convenience library.
 noinst_LTLIBRARIES = libprotocol.la
@@ -136,6 +141,7 @@ libguestfs_la_LIBADD += libprotocol.la
 
 libguestfs_la_CFLAGS = \
   -DGUESTFS_DEFAULT_PATH='"$(libdir)/guestfs"' \
+  $(HIVEX_CFLAGS) \
   $(WARN_CFLAGS) $(WERROR_CFLAGS)
 
 libguestfs_la_CPPFLAGS = -I$(top_srcdir)/gnulib/lib
@@ -179,3 +185,14 @@ guestfs.3: guestfs.pod \
 	  --name "guestfs" \
 	  --release "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \
 	  > $@
+
+# Check user doesn't try to do 'make all' or 'make check' as root.
+# https://www.redhat.com/archives/libguestfs/2010-April/msg00098.html
+
+all-local: checkroot
+check-local: checkroot
+checkroot:
+	@if [ "`id -u`" = 0 ]; then \
+	    echo "*** Error: Don't run 'make' or 'make check' as root."; \
+	    exit 1; \
+	fi