X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=src%2FMakefile.am;h=39fa2305142c4bb6e872ab7e77680d5f8b58a0b7;hp=fb37167e73d53e626791e919e8804463b8ed3e3c;hb=25521f17d5b0841a13d66fc515fac0cffe23d9a1;hpb=5e180db9eefcd6b459b805c2215ba4d174e4eb83

diff --git a/src/Makefile.am b/src/Makefile.am
index fb37167..39fa230 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 \
@@ -41,7 +41,8 @@ EXTRA_DIST = \
 	MAX_PROC_NR \
 	stamp-generator \
 	generator.ml \
-	libguestfs.3
+	libguestfs.3 \
+	guestfs.pod
 
 # Rerun the generator if it has changed.
 # Git removes empty directories, so in cases where the
@@ -49,13 +50,16 @@ EXTRA_DIST = \
 # have to create the directory first.
 noinst_DATA = stamp-generator
 
-stamp-generator: generator.ml
+stamp-generator: generator.ml ../images/test.iso
 	mkdir -p $(top_srcdir)/perl/lib/Sys
 	mkdir -p $(top_srcdir)/ruby/ext/guestfs
 	mkdir -p $(top_srcdir)/java/com/redhat/et/libguestfs
 	mkdir -p $(top_srcdir)/csharp
 	cd $(top_srcdir) && ocaml -warn-error A src/generator.ml
 
+../images/test.iso:
+	make -C ../images test.iso
+
 include_HEADERS = guestfs.h guestfs-actions.h guestfs-structs.h
 
 lib_LTLIBRARIES = libguestfs.la
@@ -117,14 +121,18 @@ libguestfs_la_SOURCES = \
 	guestfs.c \
 	guestfs.h \
 	guestfs-actions.h \
-	guestfs-actions.c \
-	guestfs-bindtests.c \
 	guestfs-internal.h \
 	guestfs_protocol.h \
 	gettext.h \
+	actions.c \
+	appliance.c \
+	bindtests.c \
+	inspect.c \
+	launch.c \
+	proto.c \
 	libguestfs.syms
 
-libguestfs_la_LIBADD = $(LTLIBTHREAD)
+libguestfs_la_LIBADD = $(HIVEX_LIBS) $(LIBPCRE) $(LIBMAGIC) $(LTLIBTHREAD) ../gnulib/lib/libgnu.la
 
 # Make libguestfs include the convenience library.
 noinst_LTLIBRARIES = libprotocol.la
@@ -132,6 +140,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
@@ -175,3 +184,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