git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sort .gitignore (using sort -d -- dictionary order).
[libguestfs.git]
/
daemon
/
Makefile.am
diff --git
a/daemon/Makefile.am
b/daemon/Makefile.am
index
8fb070f
..
a19a157
100644
(file)
--- a/
daemon/Makefile.am
+++ b/
daemon/Makefile.am
@@
-1,5
+1,5
@@
# libguestfs-daemon
# libguestfs-daemon
-# Copyright (C) 201
0
Red Hat Inc.
+# Copyright (C) 201
1
Red Hat Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@
-13,26
+13,17
@@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc.,
675 Mass Ave, Cambridge, MA 02139,
USA.
+# Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA.
-ACLOCAL_AMFLAGS = -I m4
+include $(top_srcdir)/subdir-rules.mk
-SUBDIRS = lib tests .
-
-libsrcdir = $(top_builddir)/../src
-generatorsrcdir = $(top_builddir)/../generator
+libsrcdir = $(top_builddir)/src
generator_built = \
actions.h \
stubs.c \
names.c
generator_built = \
actions.h \
stubs.c \
names.c
-.PHONY: force
-
-$(generator_built): $(generatorsrcdir)/stamp-generator
-$(generatorsrcdir)/stamp-generator: force
- $(MAKE) -C $(generatorsrcdir) stamp-generator
-
BUILT_SOURCES = \
$(generator_built) \
guestfs_protocol.c \
BUILT_SOURCES = \
$(generator_built) \
guestfs_protocol.c \
@@
-42,8
+33,7
@@
BUILT_SOURCES = \
errnostring.c \
errnostring.h
errnostring.c \
errnostring.h
-EXTRA_DIST = $(BUILT_SOURCES) \
- .gitignore
+EXTRA_DIST = $(BUILT_SOURCES)
noinst_LIBRARIES = libprotocol.a
noinst_LIBRARIES = libprotocol.a
@@
-86,17
+76,26
@@
errnostring.h: $(libsrcdir)/errnostring.h
rm -f $@
ln $< $@
rm -f $@
ln $< $@
+if INSTALL_DAEMON
+sbin_PROGRAMS = guestfsd
+else
noinst_PROGRAMS = guestfsd
noinst_PROGRAMS = guestfsd
+endif
+
guestfsd_SOURCES = \
guestfsd_SOURCES = \
+ 9p.c \
actions.h \
available.c \
augeas.c \
base64.c \
blkid.c \
blockdev.c \
actions.h \
available.c \
augeas.c \
base64.c \
blkid.c \
blockdev.c \
+ btrfs.c \
checksum.c \
cmp.c \
command.c \
checksum.c \
cmp.c \
command.c \
+ compress.c \
+ copy.c \
cpmv.c \
daemon.h \
dd.c \
cpmv.c \
daemon.h \
dd.c \
@@
-130,6
+129,7
@@
guestfsd_SOURCES = \
luks.c \
lvm.c \
lvm-filter.c \
luks.c \
lvm.c \
lvm-filter.c \
+ md.c \
mkfs.c \
mknod.c \
modprobe.c \
mkfs.c \
mknod.c \
modprobe.c \
@@
-165,7
+165,9
@@
guestfsd_SOURCES = \
guestfsd_LDADD = \
liberrnostring.a \
libprotocol.a \
guestfsd_LDADD = \
liberrnostring.a \
libprotocol.a \
- lib/libgnu.a \
+ $(SELINUX_LIB) \
+ $(AUGEAS_LIBS) \
+ $(top_builddir)/gnulib/lib/.libs/libgnu.a \
$(GETADDRINFO_LIB) \
$(HOSTENT_LIB) \
$(INET_NTOP_LIB) \
$(GETADDRINFO_LIB) \
$(HOSTENT_LIB) \
$(INET_NTOP_LIB) \
@@
-174,5
+176,7
@@
guestfsd_LDADD = \
$(LIBINTL) \
$(SERVENT_LIB)
$(LIBINTL) \
$(SERVENT_LIB)
-AM_CPPFLAGS = -I$(srcdir)/lib -Ilib
-guestfsd_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
+guestfsd_CPPFLAGS = -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib
+guestfsd_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) $(AUGEAS_CFLAGS)
+
+.PHONY: force