From bdd702c57efca4fc20958c25106866e19a59b897 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=B6r=C3=B6k=20Edvin?= Date: Sat, 29 Dec 2007 11:11:37 +0000 Subject: [PATCH] fix typo causing build failure on ppc. minor cleanup in Makefiles. git-svn: trunk@3465 --- ChangeLog | 5 +++ libclamav/Makefile.am | 3 +- libclamav/Makefile.in | 30 +++++++++++------ libclamav/lzma/Makefile.am | 6 ++-- libclamav/lzma/Makefile.in | 67 ++++++++++++-------------------------- libclamav/others.h | 4 +-- 6 files changed, 53 insertions(+), 62 deletions(-) diff --git a/ChangeLog b/ChangeLog index 79fac82bf..c51975a9e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Dec 29 12:36:36 EET 2007 (edwin) +------------------------------------ + * libclamav/others.h: fix typo causing build failure on ppc. + libclamav/Makefile.in/am: minor cleanup + Fri Dec 28 23:23:40 EET 2007 (edwin) ------------------------------------ * configure, libclamav/Makefile.in/am : add ld version script support. diff --git a/libclamav/Makefile.am b/libclamav/Makefile.am index 643ca8cf4..f4caaa404 100644 --- a/libclamav/Makefile.am +++ b/libclamav/Makefile.am @@ -192,5 +192,6 @@ libclamav_internal_utils_la_SOURCES=str.c \ libclamav_internal_utils_la_LDFLAGS=-static -lib_LTLIBRARIES = libclamav.la libclamav_internal_utils.la +lib_LTLIBRARIES = libclamav.la +noinst_LTLIBRARIES = libclamav_internal_utils.la EXTRA_DIST = regex/engine.c diff --git a/libclamav/Makefile.in b/libclamav/Makefile.in index ec54027ec..5b599f839 100644 --- a/libclamav/Makefile.in +++ b/libclamav/Makefile.in @@ -72,7 +72,7 @@ am__vpath_adj = case $$p in \ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)" libLTLIBRARIES_INSTALL = $(INSTALL) -LTLIBRARIES = $(lib_LTLIBRARIES) +LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) @ENABLE_UNRAR_FALSE@libclamav_la_DEPENDENCIES = lzma/liblzma.la @ENABLE_UNRAR_TRUE@libclamav_la_DEPENDENCIES = lzma/liblzma.la \ @ENABLE_UNRAR_TRUE@ $(top_builddir)/libclamunrar_iface/libclamunrar_iface.la @@ -420,7 +420,8 @@ libclamav_internal_utils_la_SOURCES = str.c \ md5.h libclamav_internal_utils_la_LDFLAGS = -static -lib_LTLIBRARIES = libclamav.la libclamav_internal_utils.la +lib_LTLIBRARIES = libclamav.la +noinst_LTLIBRARIES = libclamav_internal_utils.la EXTRA_DIST = regex/engine.c all: all-recursive @@ -482,10 +483,19 @@ clean-libLTLIBRARIES: echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done + +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done libclamav.la: $(libclamav_la_OBJECTS) $(libclamav_la_DEPENDENCIES) $(libclamav_la_LINK) -rpath $(libdir) $(libclamav_la_OBJECTS) $(libclamav_la_LIBADD) $(LIBS) libclamav_internal_utils.la: $(libclamav_internal_utils_la_OBJECTS) $(libclamav_internal_utils_la_DEPENDENCIES) - $(libclamav_internal_utils_la_LINK) -rpath $(libdir) $(libclamav_internal_utils_la_OBJECTS) $(libclamav_internal_utils_la_LIBADD) $(LIBS) + $(libclamav_internal_utils_la_LINK) $(libclamav_internal_utils_la_OBJECTS) $(libclamav_internal_utils_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -864,7 +874,7 @@ maintainer-clean-generic: clean: clean-recursive clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ - mostlyclean-am + clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-recursive -rm -rf ./$(DEPDIR) @@ -925,12 +935,12 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool ctags ctags-recursive \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am \ + clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \ + ctags ctags-recursive distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ install-includeHEADERS install-info install-info-am \ install-libLTLIBRARIES install-man install-pdf install-pdf-am \ install-ps install-ps-am install-strip installcheck \ diff --git a/libclamav/lzma/Makefile.am b/libclamav/lzma/Makefile.am index 422e48f81..a710577f0 100644 --- a/libclamav/lzma/Makefile.am +++ b/libclamav/lzma/Makefile.am @@ -19,7 +19,9 @@ AM_CFLAGS = -fPIC -DPIC -lib_LTLIBRARIES = liblzma.la -liblzma_la_SOURCES = LzmaStateDecode.c +noinst_LTLIBRARIES = liblzma.la +liblzma_la_SOURCES = LzmaStateDecode.c \ + LzmaStateDecode.h \ + LzmaTypes.h liblzma_la_LDFLAGS = -static diff --git a/libclamav/lzma/Makefile.in b/libclamav/lzma/Makefile.in index 36620a6a3..3dede31ee 100644 --- a/libclamav/lzma/Makefile.in +++ b/libclamav/lzma/Makefile.in @@ -62,15 +62,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/clamav-config.h CONFIG_CLEAN_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(libdir)" -libLTLIBRARIES_INSTALL = $(INSTALL) -LTLIBRARIES = $(lib_LTLIBRARIES) +LTLIBRARIES = $(noinst_LTLIBRARIES) liblzma_la_LIBADD = am_liblzma_la_OBJECTS = LzmaStateDecode.lo liblzma_la_OBJECTS = $(am_liblzma_la_OBJECTS) @@ -219,8 +211,11 @@ target_vendor = @target_vendor@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CFLAGS = -fPIC -DPIC -lib_LTLIBRARIES = liblzma.la -liblzma_la_SOURCES = LzmaStateDecode.c +noinst_LTLIBRARIES = liblzma.la +liblzma_la_SOURCES = LzmaStateDecode.c \ + LzmaStateDecode.h \ + LzmaTypes.h + liblzma_la_LDFLAGS = -static all: all-am @@ -255,35 +250,17 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ - $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ - else :; fi; \ - done -uninstall-libLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ - done - -clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ test "$$dir" != "$$p" || dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done liblzma.la: $(liblzma_la_OBJECTS) $(liblzma_la_DEPENDENCIES) - $(liblzma_la_LINK) -rpath $(libdir) $(liblzma_la_OBJECTS) $(liblzma_la_LIBADD) $(LIBS) + $(liblzma_la_LINK) $(liblzma_la_OBJECTS) $(liblzma_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -398,9 +375,6 @@ check-am: all-am check: check-am all-am: Makefile $(LTLIBRARIES) installdirs: - for dir in "$(DESTDIR)$(libdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -427,7 +401,7 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ +clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ mostlyclean-am distclean: distclean-am @@ -450,7 +424,7 @@ install-data-am: install-dvi: install-dvi-am -install-exec-am: install-libLTLIBRARIES +install-exec-am: install-html: install-html-am @@ -482,23 +456,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-libLTLIBRARIES +uninstall-am: .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool ctags distclean \ + clean-libtool clean-noinstLTLIBRARIES ctags distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libLTLIBRARIES install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libLTLIBRARIES + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/libclamav/others.h b/libclamav/others.h index 525a49f34..e3347e957 100644 --- a/libclamav/others.h +++ b/libclamav/others.h @@ -103,8 +103,8 @@ typedef struct { #define cbswap16(v) (((v & 0xff) << 8) | (((v) >> 8) & 0xff)) #define cbswap32(v) ((((v) & 0x000000ff) << 24) | (((v) & 0x0000ff00) << 8) | \ (((v) & 0x00ff0000) >> 8) | (((v) & 0xff000000) >> 24)) -#define cbswap64(v) ((((x) & 0x00000000000000ff) << 56) | \ - (((x) & 0x000000000000ff00) << 40) | \ +#define cbswap64(v) ((((v) & 0x00000000000000ff) << 56) | \ + (((v) & 0x000000000000ff00) << 40) | \ (((v) & 0x0000000000ff0000) << 24) | \ (((v) & 0x00000000ff000000) << 8) | \ (((v) & 0x000000ff00000000) >> 8) | \