diff -u -r audit-1.7.12/swig/Makefile.am audit-1.7.12.good/swig/Makefile.am --- audit-1.7.12/swig/Makefile.am 2009-02-24 16:11:36.000000000 -0500 +++ audit-1.7.12.good/swig/Makefile.am 2009-03-06 23:36:21.000000000 -0500 @@ -25,7 +25,7 @@ PYLIBVER ?= python$(PYTHON_VERSION) INCLUDES = -I. -I$(top_builddir) -I${top_srcdir}/lib -I/usr/include/$(PYLIBVER) LIBS = $(top_builddir)/lib/libaudit.la -python_PYTHON = audit.py +pyexec_PYTHON = audit.py pyexec_LTLIBRARIES = _audit.la pyexec_SOLIBRARIES = _audit.so _audit_la_LDFLAGS = -module -avoid-version diff -u -r audit-1.7.12/swig/Makefile.in audit-1.7.12.good/swig/Makefile.in --- audit-1.7.12/swig/Makefile.in 2009-02-24 16:12:03.000000000 -0500 +++ audit-1.7.12.good/swig/Makefile.in 2009-03-06 23:39:01.000000000 -0500 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -34,7 +34,7 @@ host_triplet = @host@ target_triplet = @target@ subdir = swig -DIST_COMMON = $(python_PYTHON) $(srcdir)/Makefile.am \ +DIST_COMMON = $(pyexec_PYTHON) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/src/libev/libev.m4 \ @@ -49,7 +49,7 @@ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(pyexecdir)" "$(DESTDIR)$(pythondir)" +am__installdirs = "$(DESTDIR)$(pyexecdir)" "$(DESTDIR)$(pyexecdir)" pyexecLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(pyexec_LTLIBRARIES) _audit_la_LIBADD = @@ -72,7 +72,7 @@ $(LDFLAGS) -o $@ SOURCES = $(nodist__audit_la_SOURCES) DIST_SOURCES = -pythonPYTHON_INSTALL = $(INSTALL_DATA) +pyexecPYTHON_INSTALL = $(INSTALL_DATA) py_compile = $(top_srcdir)/py-compile ETAGS = etags CTAGS = ctags @@ -89,27 +89,24 @@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GREP = @GREP@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBPRELUDE_CFLAGS = @LIBPRELUDE_CFLAGS@ @@ -118,11 +115,17 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIBWRAP_LIBS = @LIBWRAP_LIBS@ +LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -146,8 +149,7 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -180,6 +182,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -201,6 +204,7 @@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @@ -229,7 +233,7 @@ CONFIG_CLEAN_FILES = *.loT *.rej *.orig AM_CFLAGS = -fPIC -DPIC INCLUDES = -I. -I$(top_builddir) -I${top_srcdir}/lib -I/usr/include/$(PYLIBVER) -python_PYTHON = audit.py +pyexec_PYTHON = audit.py pyexec_LTLIBRARIES = _audit.la pyexec_SOLIBRARIES = _audit.so _audit_la_LDFLAGS = -module -avoid-version @@ -244,8 +248,8 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -333,33 +337,33 @@ clean-libtool: -rm -rf .libs _libs -install-pythonPYTHON: $(python_PYTHON) +install-pyexecPYTHON: $(pyexec_PYTHON) @$(NORMAL_INSTALL) - test -z "$(pythondir)" || $(MKDIR_P) "$(DESTDIR)$(pythondir)" - @list='$(python_PYTHON)'; dlist=''; for p in $$list; do\ + test -z "$(pyexecdir)" || $(MKDIR_P) "$(DESTDIR)$(pyexecdir)" + @list='$(pyexec_PYTHON)'; dlist=''; for p in $$list; do\ if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \ if test -f $$b$$p; then \ f=$(am__strip_dir) \ dlist="$$dlist $$f"; \ - echo " $(pythonPYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(pythondir)/$$f'"; \ - $(pythonPYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(pythondir)/$$f"; \ + echo " $(pyexecPYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(pyexecdir)/$$f'"; \ + $(pyexecPYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(pyexecdir)/$$f"; \ else :; fi; \ done; \ if test -n "$$dlist"; then \ if test -z "$(DESTDIR)"; then \ - PYTHON=$(PYTHON) $(py_compile) --basedir "$(pythondir)" $$dlist; \ + PYTHON=$(PYTHON) $(py_compile) --basedir "$(pyexecdir)" $$dlist; \ else \ - PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(pythondir)" $$dlist; \ + PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(pyexecdir)" $$dlist; \ fi; \ else :; fi -uninstall-pythonPYTHON: +uninstall-pyexecPYTHON: @$(NORMAL_UNINSTALL) - @list='$(python_PYTHON)'; dlist=''; for p in $$list; do\ + @list='$(pyexec_PYTHON)'; dlist=''; for p in $$list; do\ f=$(am__strip_dir) \ - rm -f "$(DESTDIR)$(pythondir)/$$f"; \ - rm -f "$(DESTDIR)$(pythondir)/$${f}c"; \ - rm -f "$(DESTDIR)$(pythondir)/$${f}o"; \ + rm -f "$(DESTDIR)$(pyexecdir)/$$f"; \ + rm -f "$(DESTDIR)$(pyexecdir)/$${f}c"; \ + rm -f "$(DESTDIR)$(pyexecdir)/$${f}o"; \ done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -367,7 +371,7 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -439,7 +443,7 @@ check: check-am all-am: Makefile $(LTLIBRARIES) installdirs: - for dir in "$(DESTDIR)$(pyexecdir)" "$(DESTDIR)$(pythondir)"; do \ + for dir in "$(DESTDIR)$(pyexecdir)" "$(DESTDIR)$(pyexecdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -488,11 +492,11 @@ info-am: -install-data-am: install-pythonPYTHON +install-data-am: install-dvi: install-dvi-am -install-exec-am: install-pyexecLTLIBRARIES +install-exec-am: install-pyexecLTLIBRARIES install-pyexecPYTHON install-html: install-html-am @@ -524,7 +528,7 @@ ps-am: -uninstall-am: uninstall-pyexecLTLIBRARIES uninstall-pythonPYTHON +uninstall-am: uninstall-pyexecLTLIBRARIES uninstall-pyexecPYTHON .MAKE: install-am install-strip @@ -536,12 +540,12 @@ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ - install-pyexecLTLIBRARIES install-pythonPYTHON install-strip \ + install-pyexecLTLIBRARIES install-pyexecPYTHON 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-pyexecLTLIBRARIES \ - uninstall-pythonPYTHON + uninstall-pyexecPYTHON PYLIBVER ?= python$(PYTHON_VERSION) _audit_la_HEADERS: $(top_builddir)/config.h