|
From: <sv...@va...> - 2005-09-01 01:05:21
|
Author: njn Date: 2005-09-01 02:05:14 +0100 (Thu, 01 Sep 2005) New Revision: 4605 Log: Back out 4604 which broke things. Modified: branches/ASPACEM/Makefile.am branches/ASPACEM/coregrind/Makefile.am Modified: branches/ASPACEM/Makefile.am =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/ASPACEM/Makefile.am 2005-08-31 23:50:41 UTC (rev 4604) +++ branches/ASPACEM/Makefile.am 2005-09-01 01:05:14 UTC (rev 4605) @@ -16,9 +16,8 @@ # And we want to include Addrcheck in the distro, but not compile/test i= t. # Put docs last because building the HTML is slow and we want to get # everything else working before we try it. -BUILD_SUBDIRS =3D include coregrind . tests auxprogs $(TOOLS) helgrind d= ocs -SUBDIRS =3D VEX $(BUILD_SUBDIRS) -DIST_SUBDIRS =3D $(BUILD_SUBDIRS) addrcheck +SUBDIRS =3D include coregrind . tests auxprogs $(TOOLS) helgrind docs +DIST_SUBDIRS =3D $(SUBDIRS) addrcheck =20 SUPP_FILES =3D \ glibc-2.2.supp glibc-2.3.supp glibc-2.4.supp \ @@ -86,8 +85,6 @@ VEX/LICENSE.README \ VEX/LICENSE.GPL \ VEX/Makefile \ - VEX/test_main.c \ - VEX/test_main.h \ VEX/auxprogs/genoffsets.c \ VEX/pub/libvex_guest_amd64.h \ VEX/pub/libvex_ir.h \ Modified: branches/ASPACEM/coregrind/Makefile.am =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/ASPACEM/coregrind/Makefile.am 2005-08-31 23:50:41 UTC (rev 4= 604) +++ branches/ASPACEM/coregrind/Makefile.am 2005-09-01 01:05:14 UTC (rev 4= 605) @@ -133,6 +133,12 @@ -Wl,--soname,vg_preload_core.so \ -Wl,-z,initfirst =20 +@VEX_DIR@/libvex.a: @VEX_DIR@/priv/main/vex_svnversion.h + $(MAKE) -C @VEX_DIR@ libvex.a + +@VEX_DIR@/priv/main/vex_svnversion.h: + $(MAKE) -C @VEX_DIR@ version + clean-local: $(MAKE) -C @VEX_DIR@ clean =20 |