Fixed builds from a directory outside of the sourcetree.

[captive.git] / src / install / acquire / Makefile.am

diff --git a/src/install/acquire/Makefile.am b/src/install/acquire/Makefile.am
index 83c0620..369c4b0 100644 (file)
--- a/src/install/acquire/Makefile.am
+++ b/src/install/acquire/Makefile.am
@@ -30,6 +30,12 @@ GLADE_OUT= \
                ui-gnome-support.c \
                ui-gnome-support.h
 
+if ENABLE_STANDALONE
+standalone_libntfs_cond= \
+               standalone-libntfs.c \
+               standalone-libntfs.h
+endif
+
 captive_install_acquire_SOURCES= \
                cabextract/cabextract.c \
                cabextract/cabextract.h \
@@ -37,8 +43,6 @@ captive_install_acquire_SOURCES= \
                cabinet.h \
                cabinet-memory.c \
                cabinet-memory.h \
-               captivemodid.c \
-               captivemodid.h \
                diskscan.c \
                diskscan.h \
                final.c \
@@ -53,6 +57,7 @@ captive_install_acquire_SOURCES= \
                ui-line.h \
                ui-gnome.c \
                ui-gnome.h \
+               $(standalone_libntfs_cond) \
                $(GLADE_OUT)
 
 EXTRA_captive_install_acquire_SOURCES= \
@@ -68,16 +73,14 @@ CLEANFILES+=gnome_vfs_read_entire_file.c
 
 EXTRA_DIST+= \
                $(GLADE_IN) \
-               cabextract/.vimrc \
-               captivemodid-list.pl \
-               captivemodid-print.pl
+               cabextract/.vimrc
 
 captive_install_acquire-ui-gnome-interface.$(OBJEXT): ui-gnome-callbacks.h
 
 if HAVE_GLADE_WRITESOURCE
 # touch(1) as 'ui-gnome-callbacks.h' are not overwritten if not changed:
 $(GLADE_OUT): $(GLADE_IN)
-       sh $(top_srcdir)/macros/glade-w.sh $<
+       sh $(top_builddir)/macros/glade-w.sh $<
        @touch ui-gnome-callbacks.h
 
 endif
@@ -87,10 +90,11 @@ CLEANFILES+= \
                ui-gnome.glade.bak \
                ui-gnome.gladep.bak
 
-captive_install_acquire_CFLAGS=$(GNOME_VFS_CFLAGS) $(LIBXML_CFLAGS) $(OPENSSL_CFLAGS)
-captive_install_acquire_LDADD+=$(GNOME_VFS_LIBS)   $(LIBXML_LIBS)   $(OPENSSL_LIBS)
-captive_install_acquire_LDADD+= $(READLINE_LIBS)    $(LIBNTFS_LIBS) $(POPT_LIBS) $(INTLLIBS) $(captive_library)
+captive_install_acquire_CFLAGS=$(GNOME_VFS_MODULE_CFLAGS) $(LIBXML_CFLAGS) $(OPENSSL_CFLAGS)
+captive_install_acquire_LDADD+=$(GNOME_VFS_MODULE_LIBS)   $(LIBXML_LIBS)   $(OPENSSL_LIBS)
+captive_install_acquire_LDADD+= $(READLINE_LIBS)    $(LIBNTFS_LIBS) $(LIBNTFS_GNOMEVFS_LIBS)
 captive_install_acquire_LDFLAGS=$(READLINE_LDFLAGS)
+captive_install_acquire_LDADD+=$(POPT_LIBS) $(INTLLIBS) $(captive_library)
 
 # FIXME: /usr/include/gtk-2.0/gtk/gtkitemfactory.h:51: warning: function declaration isn't a prototype
 # /* We use () here to mean unspecified arguments. This is deprecated
@@ -103,14 +107,9 @@ captive_install_acquire_LDFLAGS=$(READLINE_LDFLAGS)
 captive_install_acquire_CFLAGS+=$(GNOMEUI_CFLAGS)
 captive_install_acquire_LDADD +=$(GNOMEUI_LIBS)
 
-captive_install_acquire_CFLAGS+=-DSYSCONFDIR="$(sysconfdir)"
 captive_install_acquire_CFLAGS+=-DVARLIBCAPTIVEDIR="$(localstatedir)/lib/$(PACKAGE)"
 captive_install_acquire_LDADD+=../libcaptive-install/libcaptive-install.a
 
-sysconf_DATA= \
-               w32-mod-id.captivemodid.xml
-EXTRA_DIST+=$(sysconf_DATA)
-
 if ENABLE_INSTALL_PKG
 captive_install_acquire_cond=captive-install-acquire
 endif