mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make it possible to build in a separate directory

Browse Source 
This patch allows you to do:
mkdir build
cd build
../configure ...
make

This will output all generated files to the build directory. Given that
autogen automatically runs configure, you can also do:

BUILDDIR=./build ./autogen.sh

which will do the right thing.

Also:

* Fix a dependency bug which means that guestfs_protocol.h
  isn't automatically rebuilt.
* Re-running autogen.sh with no arguments won't blow away your previous
  configure arguments.
This commit is contained in:
Matthew Booth
2009-07-03 11:52:50 +01:00
parent 5f9cb51f11
commit 349814e9d9
22 changed files with 104 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
java/Makefile.am
View File

@@ -15,18 +15,18 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
CPTH = com/redhat/et/libguestfs
java_prefix = com/redhat/et/libguestfs
java_sources = \
$(CPTH)/LibGuestFSException.java \
$(CPTH)/IntBool.java \
$(CPTH)/PV.java \
$(CPTH)/VG.java \
$(CPTH)/LV.java \
$(CPTH)/Stat.java \
$(CPTH)/StatVFS.java \
$(CPTH)/Dirent.java \
$(CPTH)/GuestFS.java
$(java_prefix)/LibGuestFSException.java \
$(java_prefix)/IntBool.java \
$(java_prefix)/PV.java \
$(java_prefix)/VG.java \
$(java_prefix)/LV.java \
$(java_prefix)/Stat.java \
$(java_prefix)/StatVFS.java \
$(java_prefix)/Dirent.java \
$(java_prefix)/GuestFS.java
java_tests = \
Bindtests.java \
@@ -50,7 +50,7 @@ libguestfs_jardir = $(JAR_INSTALL_DIR)
libguestfs_jar_DATA = libguestfs-${VERSION}.jar
libguestfs_jar_class_files = $(java_sources:.java=.class)
$(libguestfs_jar_class_files): %.class: %.java
$(JAVAC) $(JAVAC_FLAGS) -classpath $(CPTH) $(java_sources)
$(JAVAC) $(JAVAC_FLAGS) -d @builddir@ -classpath @srcdir@:@builddir@ -sourcepath @srcdir@:@builddir@ $<
libguestfs-${VERSION}.jar: $(libguestfs_jar_class_files)
$(JAR) cf $@ $^
@@ -64,12 +64,12 @@ libguestfs_jni_la_SOURCES = \
libguestfs_jni_la_LIBADD = $(top_builddir)/src/libguestfs.la
libguestfs_jni_la_LDFLAGS = -version-info $(JNI_VERSION_INFO)
libguestfs_jni_la_CFLAGS = -Wall -I$(top_builddir)/src $(JNI_CFLAGS)
libguestfs_jni_la_CFLAGS = -Wall -I$(top_srcdir)/src -I$(top_builddir)/src $(JNI_CFLAGS)
BUILT_SOURCES = com_redhat_et_libguestfs_GuestFS.h
com_redhat_et_libguestfs_GuestFS.h: $(CPTH)/GuestFS.class
$(JAVAH) -classpath .:$(CPTH) com.redhat.et.libguestfs.GuestFS
com_redhat_et_libguestfs_GuestFS.h: $(java_prefix)/GuestFS.class
$(JAVAH) -classpath @srcdir@:@builddir@ com.redhat.et.libguestfs.GuestFS
# Documentation.