X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=src%2FMakefile.am;h=39fa2305142c4bb6e872ab7e77680d5f8b58a0b7;hp=7d9220a7bbac4d491506e3b7c6df1a598c710198;hb=4ea0abfce413767868a8f53b3d20e5d2f62dff08;hpb=8980c01b46eafcf4b5dc127e4696c2cbe1bff09f

diff --git a/src/Makefile.am b/src/Makefile.am
index 7d9220a..39fa230 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,11 +22,12 @@ 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
+	guestfs-structs.pod \
+	libguestfs.syms
 
 $(generator_built): stamp-generator
 
@@ -40,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
@@ -48,12 +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
@@ -107,19 +113,26 @@ libprotocol_la_CFLAGS =
 #
 # Note that this scheme means the real library version will always be
 # 'libguestfs.so.0.$(MAX_PROC_NR).0'.
-
 libguestfs_la_LDFLAGS = -version-info $(MAX_PROC_NR):0:$(MAX_PROC_NR)
+
+libguestfs_la_LDFLAGS += $(VERSION_SCRIPT_FLAGS)libguestfs.syms
+
 libguestfs_la_SOURCES = \
 	guestfs.c \
 	guestfs.h \
 	guestfs-actions.h \
-	guestfs-actions.c \
-	guestfs-bindtests.c \
 	guestfs-internal.h \
 	guestfs_protocol.h \
-	gettext.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
@@ -127,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
@@ -170,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