mess with build system

.gitignore

@@ -4,19 +4,47 @@
 *.o
 *.lo
 *~
-config.h
-*deps/*.*o
-*/*deps/*.*o
-*/*/*deps/*.*o
-*/*/*/*deps/*.*o
-*/*/*/*/*deps/*.*o
-*/*/*/*/*/*deps/*.*o
+*.status
+./config.h
+*config.h
+*confdefs.h
+*conftest*
+*deps/*
+*/*deps/*
+*/*/*deps/*
+*/*/*/*deps/*
+*/*/*/*/*deps/*
+*/*/*/*/*/*deps/*
+*libs/*
+*/*libs/*
+*/*/*libs/*
+*/*/*/*libs/*
+*/*/*/*/*libs/*
+*/*/*/*/*/*libs/*
+*.a
+*.la
+*.lai
+*.dylib
+*dirstamp
 *.dSYM
 stamp-h*
-*stamp-h1
-*/*stamp-h1
-*/*/*stamp-h1
-*/*/*/*stamp-h1
-*/*/*/*/*stamp-h1
-*/*/*/*/*/*stamp-h1
+*stamp-h*
+*/*stamp-h*
+*/*/*stamp-h*
+*/*/*/*stamp-h*
+*/*/*/*/*stamp-h*
+*/*/*/*/*/*stamp-h*
 *.pyc
+*libtool
+*.build
+*.perspectivev3
+*.pbxuser
+*xcode/build/*
+*FrameworkSample/build/*
+*build/Debug/*
+*build/*
+*.vcproj-e
+*.userprefs
+*.class
+zarith-1.0/Makefile.orig
+*.depend

INSTALL

@@ -1,7 +1,7 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation,
+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
 Inc.
 
    Copying and distribution of this file, with or without modification,

Makefile

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # Makefile.  Generated from Makefile.in by configure.
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -14,23 +14,51 @@
 
 
 
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/bap
 pkgincludedir = $(includedir)/bap
 pkglibdir = $(libdir)/bap
@@ -47,8 +75,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = x86_64-apple-darwin11.4.2
-host_triplet = x86_64-apple-darwin11.4.2
+build_triplet = x86_64-apple-darwin10.8.0
+host_triplet = x86_64-apple-darwin10.8.0
 subdir = .
 DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
 	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
@@ -173,24 +201,24 @@ distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
-ACLOCAL = ${SHELL} /private/var/root/Downloads/bap-0.7/missing aclocal-1.13
+ACLOCAL = ${SHELL} /var/root/bap/missing aclocal-1.13
 AMTAR = $${TAR-tar}
 AM_DEFAULT_VERBOSITY = 1
 AR = ar
-ASMIR_DIR = /private/var/root/Downloads/bap-0.7/libasmir
-AUTOCONF = ${SHELL} /private/var/root/Downloads/bap-0.7/missing autoconf
-AUTOHEADER = ${SHELL} /private/var/root/Downloads/bap-0.7/missing autoheader
-AUTOMAKE = ${SHELL} /private/var/root/Downloads/bap-0.7/missing automake-1.13
+ASMIR_DIR = /var/root/bap/libasmir
+AUTOCONF = ${SHELL} /var/root/bap/missing autoconf
+AUTOHEADER = ${SHELL} /var/root/bap/missing autoheader
+AUTOMAKE = ${SHELL} /var/root/bap/missing automake-1.13
 AWK = gawk
-BAP_DIR = /private/var/root/Downloads/bap-0.7
+BAP_DIR = /var/root/bap
 CAMLIDL = /private/var/root/.opam/system/bin/camlidl
 CAMLP4 = /opt/local/bin/camlp4
 CAMLP4O = /opt/local/bin/camlp4o
 CAMLP4OF = /opt/local/bin/camlp4of
 CAMLP4R = /opt/local/bin/camlp4r
 CC = gcc
 CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2 -DAMD64
+CFLAGS = -g -O2
 CPP = gcc -E
 CPPFLAGS = -I/opt/local/include/ -I/private/var/root/.opam/system/lib/camlidl
 CXX = g++
@@ -206,18 +234,18 @@ DUMPBIN =
 ECHO_C = \c
 ECHO_N = 
 ECHO_T = 
-EGREP = /opt/local/bin/grep -E
+EGREP = /sw/bin/pathsetup.sh/bin/grep -E
 EXEEXT = 
-FGREP = /opt/local/bin/grep -F
-GREP = /opt/local/bin/grep
+FGREP = /sw/bin/pathsetup.sh/bin/grep -F
+GREP = /sw/bin/pathsetup.sh/bin/grep
 HAVE_LLVM_AC = no
-INCDIRS = /private/var/root/.opam/system/lib/camlidl
+INCDIRS = 
 INSTALL = /opt/local/bin/ginstall -c
 INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LD = /opt/local/bin/ld
+LD = /usr/libexec/gcc/i686-apple-darwin10/4.2.1/ld
 LDFLAGS = -L/opt/local/lib -L/opt/local/lib/x86_64/
 LIBOBJS =  ${LIBOBJDIR}error$U.o
 LIBS = -lpthread -lprotobuf -lopcodes -ldl -lz -lpcre -liberty -lbfd 
@@ -227,7 +255,8 @@ LLVM_PACKAGE =
 LLVM_PPFLAGS = 
 LN_S = ln -s
 LTLIBOBJS =  ${LIBOBJDIR}error$U.lo
-MAKEINFO = ${SHELL} /private/var/root/Downloads/bap-0.7/missing makeinfo
+MAINT = #
+MAKEINFO = ${SHELL} /var/root/bap/missing makeinfo
 MANIFEST_TOOL = :
 MKDIR_P = /opt/local/bin/gmkdir -p
 NM = /opt/local/bin/nm
@@ -240,7 +269,7 @@ OCAMLDEP = /opt/local/bin/ocamldep.opt
 OCAMLDEP_OPT = /opt/local/bin/ocamldep.opt
 OCAMLDOC = /opt/local/bin/ocamldoc.opt
 OCAMLDOC_OPT = /opt/local/bin/ocamldoc.opt
-OCAMLFIND = /private/var/root/.opam/system/bin/ocamlfind
+OCAMLFIND = /opt/local/bin/ocamlfind
 OCAMLLEX = /opt/local/bin/ocamllex.opt
 OCAMLLEX_OPT = /opt/local/bin/ocamllex.opt
 OCAMLMKLIB = /opt/local/bin/ocamlmklib
@@ -249,7 +278,7 @@ OCAMLOPT = /opt/local/bin/ocamlopt.opt
 OCAMLOPT_OPT = /opt/local/bin/ocamlopt.opt
 OCAMLYACC = /opt/local/bin/ocamlyacc
 OTOOL = otool
-OTOOL64 = :
+OTOOL64 = otool64
 PACKAGE = bap
 PACKAGE_BUGREPORT = [email protected]
 PACKAGE_NAME = Bap
@@ -264,13 +293,13 @@ SET_MAKE =
 SHELL = /bin/sh
 STRIP = strip
 VERSION = 0.7
-VEX_DIR = /private/var/root/Downloads/bap-0.7/VEX
+VEX_DIR = /var/root/bap/VEX
 YACC = bison -y
 YFLAGS = 
-abs_builddir = /private/var/root/Downloads/bap-0.7
-abs_srcdir = /private/var/root/Downloads/bap-0.7
-abs_top_builddir = /private/var/root/Downloads/bap-0.7
-abs_top_srcdir = /private/var/root/Downloads/bap-0.7
+abs_builddir = /var/root/bap
+abs_srcdir = /var/root/bap
+abs_top_builddir = /var/root/bap
+abs_top_srcdir = /var/root/bap
 ac_ct_AR = ar
 ac_ct_CC = gcc
 ac_ct_CXX = g++
@@ -281,26 +310,26 @@ am__quote =
 am__tar = $${TAR-tar} chof - "$$tardir"
 am__untar = $${TAR-tar} xf -
 bindir = ${exec_prefix}/bin
-build = x86_64-apple-darwin11.4.2
+build = x86_64-apple-darwin10.8.0
 build_alias = 
 build_cpu = x86_64
-build_os = darwin11.4.2
+build_os = darwin10.8.0
 build_vendor = apple
 builddir = .
 datadir = ${datarootdir}
 datarootdir = ${prefix}/share
 docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 dvidir = ${docdir}
 exec_prefix = ${prefix}
-host = x86_64-apple-darwin11.4.2
+host = x86_64-apple-darwin10.8.0
 host_alias = 
 host_cpu = x86_64
-host_os = darwin11.4.2
+host_os = darwin10.8.0
 host_vendor = apple
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = ${SHELL} /private/var/root/Downloads/bap-0.7/install-sh
+install_sh = ${SHELL} /var/root/bap/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
@@ -330,7 +359,7 @@ all: all-recursive
 .SUFFIXES:
 am--refresh: Makefile
 	@:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -357,9 +386,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: # $(am__configure_deps)
 	$(am__cd) $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): # $(am__aclocal_m4_deps)
 	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 $(am__aclocal_m4_deps):
 libtracewrap/Makefile: $(top_builddir)/config.status $(top_srcdir)/libtracewrap/Makefile.in
@@ -387,13 +416,12 @@ distclean-libtool:
 #     (which will cause the Makefiles to be regenerated when you run 'make');
 # (2) otherwise, pass the desired values on the 'make' command line.
 $(am__recursive_targets):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	case "$@" in \
@@ -788,6 +816,7 @@ uninstall-am:
 	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
 	ps ps-am tags tags-am uninstall uninstall-am
 
+
 # Work around buggy Debian ocaml patch
 # See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=678577
 export OCAML_COMPAT='c'

Makefile.am

@@ -1,4 +1,5 @@
 ACLOCAL_AMFLAGS = -I m4
+
 # Work around buggy Debian ocaml patch
 # See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=678577
 export OCAML_COMPAT='c'