--- embedaddon/smartmontools/Makefile.am 2012/02/21 16:32:16 1.1.1.1
+++ embedaddon/smartmontools/Makefile.am 2012/10/09 09:36:45 1.1.1.2
@@ -1,10 +1,12 @@
## Process this file with automake to produce Makefile.in
#
-# $Id: Makefile.am,v 1.1.1.1 2012/02/21 16:32:16 misho Exp $
+# $Id: Makefile.am,v 1.1.1.2 2012/10/09 09:36:45 misho Exp $
#
@SET_MAKE@
+ACLOCAL_AM_FLAGS = -I m4
+
# Make sure .cpp takes precedence to avoid compiling old .c file
SUFFIXES = .cpp .c .s .o
@@ -329,6 +331,7 @@ EXTRA_DIST = \
smartd.conf \
smartd.service.in \
update-smart-drivedb.in \
+ m4/pkg.m4 \
os_darwin/SMART.in \
os_darwin/StartupParameters.plist \
os_darwin/English_Localizable.strings \
@@ -376,13 +379,14 @@ MAINTAINERCLEANFILES = \
$(srcdir)/depcomp \
$(srcdir)/install-sh \
$(srcdir)/missing \
- $(srcdir)/mkinstalldirs
+ $(srcdir)/mkinstalldirs \
+ $(srcdir)/m4/pkg.m4
utility.o: svnversion.h
if IS_SVN_BUILD
# Get version info from SVN
-svnversion.h: CHANGELOG Makefile $(srcdir)/.svn/entries
+svnversion.h: CHANGELOG Makefile $(svn_deps)
echo '/* svnversion.h. Generated by Makefile from svn info. */' > $@
(cd $(srcdir) \
&& svnversion 2>/dev/null | sed -n 's,^\([0-9].*\),REV "\1",p' \
@@ -540,7 +544,8 @@ MAN_FILTER = \
-e '/^\.\\" %IF OS .*$(os_man_filter)/,/^\.\\" %ENDIF OS .*$(os_man_filter)/ s,^,!!,' \
-e '/^\.\\" %IF OS ./,/^\.\\" %ENDIF OS ./ s,^,.\\"\# ,' \
-e '/^!*\.\\" %IF NOT OS ./,/^!*\.\\" %ENDIF NOT OS ./ s,^,!!,' \
- -e '/^!!/{ s,^!!!*,,; s,^\.\\"! \(.*\)$$,\1 \\"\#, ;}' ; \
+ -e 's,^!!!*\.\\"! \(.*\)$$,\1 \\"\#,' \
+ -e 's,^!!!*,,' ; \
else \
cat; \
fi
@@ -562,11 +567,11 @@ MAN2HTML = man2html
MAN2TXT = groff -man -Tascii -P'-bcou'
# Remove HTTP header and fix links in man2html output
-FIXHTML = sed '1s,^Content-type.*,,' \
- | sed 's,,,g' \
- | sed 's,,,g' \
- | sed 's,\([^<]*\),\1,g' \
- | sed 's,\([^<]*\),\1,g'
+FIXHTML = sed -e '1s,^Content-type.*,,' \
+ -e 's,,,g' \
+ -e 's,,,g' \
+ -e 's,\([^<]*\),\1,g' \
+ -e 's,\([^<]*\),\1,g'
# Convert man pages into .html and .txt
@@ -651,7 +656,7 @@ FILES_WIN32 = \
$(docdir_win32)/README.txt \
$(docdir_win32)/TODO.txt \
$(docdir_win32)/WARNINGS.txt \
- $(docdir_win32)/checksums.txt \
+ $(docdir_win32)/checksums$(win_bits).txt \
$(docdir_win32)/smartd.conf \
$(docdir_win32)/smartctl.8.html \
$(docdir_win32)/smartctl.8.txt \
@@ -703,11 +708,13 @@ if OS_WIN32_NSIS
# Build NSIS installer
# Note: Only option character '-' is also compatible with Linux version of makensis
$(distinst_win32): os_win32/installer.nsi distdir.mkdir $(FILES_WIN32)
+ test -z '$(builddir_win64)' || ( cd $(builddir_win64) && make distdir-win32 )
@date=`sed -n 's,^.*DATE[^"]*"\([^"]*\)".*$$,\1,p' svnversion.h`; \
rev=`sed -n 's,^.*REV[^"]*"\([^"]*\)".*$$,r\1,p' svnversion.h`; \
verstr="$(PACKAGE_VERSION) $$date $$rev "$(BUILD_INFO); \
- echo "'$(MAKENSIS)' -V2 -NOCD -DINPDIR=$(distdir_win32) -DOUTFILE=$@ -DVERSTR='$$verstr' $<"; \
- '$(MAKENSIS)' -V2 -NOCD -DINPDIR=$(distdir_win32) -DOUTFILE=$@ -DVERSTR="$$verstr" $<
+ d64=; test -z '$(builddir_win64)' || d64='-DINPDIR64=$(builddir_win64)/$(PACKAGE)-$(VERSION).win64'; \
+ echo "'$(MAKENSIS)' -V2 -NOCD -DINPDIR=$(distdir_win32) $$d64 -DOUTFILE=$@ -DVERSTR='$$verstr' $<"; \
+ '$(MAKENSIS)' -V2 -NOCD -DINPDIR=$(distdir_win32) $$d64 -DOUTFILE=$@ -DVERSTR="$$verstr" $<
md5sum $@ > $@.md5
sha1sum $@ > $@.sha1
sha256sum $@ > $@.sha256
@@ -767,7 +774,7 @@ $(docdir_win32)/%.conf: $(srcdir)/%.conf
$(UNIX2DOS) < $< > $@
touch -r $< $@
-$(docdir_win32)/checksums.txt: $(EXEFILES_WIN32)
+$(docdir_win32)/checksums$(win_bits).txt: $(EXEFILES_WIN32)
(cd $(exedir_win32) && md5sum *.exe && sha1sum *.exe && sha256sum *.exe) \
| $(UNIX2DOS) > $@
@@ -813,7 +820,7 @@ config-vc10: $(srcdir)/os_win32/config_vc10.h $(srcdi
$(srcdir)/os_win32/config_vc10.h: config.h Makefile
sed -e '1i/* config_vc10.h. Generated from config.h by Makefile. */' \
- -e 's,^#define HAVE_\(ATTR_PACKED\|INTTYPES_H\|[DK_]*NTDDDISK_H\|STRINGS_H\|STRTOULL\|UNISTD_H\|WORKING_SNPRINTF\) 1$$,/* #undef HAVE_\1 */,' \
+ -e 's,^#define HAVE_\(ATTR_PACKED\|GETTIMEOFDAY\|INTTYPES_H\|[DK_]*NTDDDISK_H\|STRINGS_H\|STRTOULL\|UNISTD_H\|WORKING_SNPRINTF\) 1$$,/* #undef HAVE_\1 */,' \
-e 's,^\(#define SMARTMONTOOLS_BUILD_HOST "[^-]*\)[^"]*,\1-pc-w32vc10,' $< > $@
$(srcdir)/os_win32/svnversion_vc10.h: svnversion.h