--- embedaddon/istgt/src/Makefile.in	2012/02/21 16:42:02	1.1.1.1
+++ embedaddon/istgt/src/Makefile.in	2012/10/09 09:13:23	1.1.1.2
@@ -10,8 +10,10 @@ exec_prefix = @exec_prefix@
 bindir   = @bindir@
 sbindir  = @sbindir@
 sysconfdir = @sysconfdir@
-datadir  = @datarootdir@
+datarootdir = @datarootdir@
+datadir  = @datadir@
 libexecdir = @libexecdir@
+mandir   = @mandir@
 
 CC       = @CC@
 CFLAGS   = @CFLAGS@
@@ -20,19 +22,21 @@ LDFLAGS  = @LDFLAGS@
 DEFS     = @DEFS@
 LIBS     = @LIBS@
 INSTALL  = @INSTALL@
+MKDIR_P  = @MKDIR_P@
 RANLIB   = @RANLIB@
 MKDEP	 = @MKDEP@
 
 CFLAGS  += -DDEBUG
 CFLAGS  += -fno-strict-aliasing -Wstrict-aliasing
+CFLAGS  += -Wformat=2 -Wreturn-type
 CFLAGS  += -Wbad-function-cast -Wcast-align
 CFLAGS  += -Wcast-qual -Wchar-subscripts -Winline
 CFLAGS  += -Wmissing-prototypes -Wnested-externs -Wpointer-arith
 CFLAGS  += -Wredundant-decls -Wshadow -Wstrict-prototypes -Wwrite-strings
 
 source   = istgt.c istgt_iscsi.c istgt_iscsi_param.c \
-	istgt_lu.c istgt_lu_disk.c istgt_lu_dvd.c istgt_lu_tape.c \
-	istgt_lu_pass.c istgt_lu_ctl.c \
+	istgt_lu.c istgt_lu_disk.c istgt_lu_disk_vbox.c \
+	istgt_lu_dvd.c istgt_lu_tape.c istgt_lu_pass.c istgt_lu_ctl.c \
 	istgt_log.c istgt_conf.c istgt_sock.c istgt_misc.c \
 	istgt_queue.c istgt_crc32c.c istgt_md5.c
 header   = istgt_ver.h istgt.h istgt_iscsi.h istgt_iscsi_param.h \
@@ -74,27 +78,31 @@ DISTFILES = Makefile.in config.h.in build.h.in \
 .c.o:
 	$(CC) $(DEFS) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
 
+.PHONY: all install install-dirs
 all: stamp-depend config.h istgt istgtcontrol
 
 istgt: $(ISTGT)
-	$(CC) $(LDFLAGS) $(LIBS) -o $@ $(ISTGT)
+	$(CC) $(LDFLAGS) -o $@ $(ISTGT) $(LIBS)
 
 istgtcontrol: $(ISTGTCONTROL)
-	$(CC) $(LDFLAGS) $(LIBS) -o $@ $(ISTGTCONTROL)
+	$(CC) $(LDFLAGS) -o $@ $(ISTGTCONTROL) $(LIBS)
 
 install: install-dirs
-	install -c -m 0755 istgt $(DESTDIR)$(bindir)
-	install -c -m 0755 istgtcontrol $(DESTDIR)$(bindir)
+	$(INSTALL) -m 0755 istgt $(DESTDIR)$(bindir)
+	$(INSTALL) -m 0755 istgtcontrol $(DESTDIR)$(bindir)
 
 install-dirs:
-	mkdir -p $(DESTDIR)$(bindir)
+	$(MKDIR_P) $(DESTDIR)$(bindir)
 
+.PHONY: dist clean distclean depend
 dist: $(DISTFILES)
-	mkdir $(DISTDIR)/$(subdir)
-	cd $(srcdir); thisdir=`pwd`; \
-	for file in `echo $(DISTFILES) | sort`; do \
-	  cp -p $$thisdir/$$file $(DISTDIR)/$(subdir); \
-	done
+	if [ -f "$(top_srcdir)/distdir" ]; then \
+		$(MKDIR_P) $(DISTDIR)/$(subdir) \
+		cd $(srcdir); thisdir=`pwd`; \
+		for file in `echo $(DISTFILES) | sort`; do \
+		    cp -p $$thisdir/$$file $(DISTDIR)/$(subdir); \
+		done \
+	fi
 
 depend:
 	if [ "x$(MKDEP)" != "x" ]; then \