summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Harmon <russ@eatnumber1.com>2009-03-25 03:10:51 -0400
committerRussell Harmon <russ@eatnumber1.com>2009-03-25 03:10:51 -0400
commit8310d29e2159dc151c3081067bbb7a501fc6a759 (patch)
tree87acf33c9af8a1a1fe9672cee689a47059e2b420 /dev-libs
parentFix stuff (diff)
downloadeatnumber1-8310d29e2159dc151c3081067bbb7a501fc6a759.tar.gz
eatnumber1-8310d29e2159dc151c3081067bbb7a501fc6a759.tar.bz2
eatnumber1-8310d29e2159dc151c3081067bbb7a501fc6a759.zip
Fix mad shit, yo.
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/arch/Manifest8
-rw-r--r--dev-libs/arch/arch-2.5a.ebuild2
-rw-r--r--dev-libs/arch/files/Makefile.am1
-rw-r--r--dev-libs/arch/files/arch.pc.in8
-rw-r--r--dev-libs/arch/files/configure.ac4
5 files changed, 15 insertions, 8 deletions
diff --git a/dev-libs/arch/Manifest b/dev-libs/arch/Manifest
index f0c5ec2..fa801ef 100644
--- a/dev-libs/arch/Manifest
+++ b/dev-libs/arch/Manifest
@@ -1,6 +1,6 @@
-AUX Makefile.am 607 RMD160 2f5fe06e5061db1d1d3c3f0d9bc5d8f49302c71d SHA1 50b4731d8ca33e3f6d2235a81a9809a85a554e9c SHA256 e6cbd3d979d858983e7d299fbc1fdd7083736c72e61e18a3a662d339c48c5140
-AUX arch.pc.in 104 RMD160 b7bf13d42d0b017f887a3ad91b2a3ab9988c5232 SHA1 d45e091509408f1e1a5231972b5123b7a65f58e8 SHA256 a5803bf0b5576ee5e8d28ff9ee913e9f3dcfe1ddf0c57526abe9805690a709e8
-AUX configure.ac 184 RMD160 c414dca1010b62b790a547dcd168a92dbda8d1d6 SHA1 d89de810d13c848efac77f533344124dc4d22aae SHA256 966b2e2ad361aa87a181ee4403c12fbd4c8d7e80c4772d54f86196f8b64ec662
+AUX Makefile.am 647 RMD160 978c2b9b02d5a7ff7129e32c240d108c2fe67fd1 SHA1 1d26c7ad9fdf7d338774d71ea9617d208456652d SHA256 1eb0fdb91e3d8c3cff890bb92fba5064a25aec1921dac0a91368ff8693281510
+AUX arch.pc.in 253 RMD160 714e19a8771d5c20bc71252813c960c8e9c20867 SHA1 12ff0ebc742a99c5e673075f7d485af5b575021e SHA256 1efc63c7dc0c38f4d33dde6fe1a94831a95bd2957e39c30a640e5c905f82744f
+AUX configure.ac 178 RMD160 f0000edf33e19bb11f6f61a2fa3e8aed2aed82d9 SHA1 77311a5ba69fac7e7ef02d0a09b38f7811af1b3d SHA256 5a6ea5b82e128d389cc01ec2a7285519fe5896629a970309ef036a333e5eb8d9
AUX libarch_autotools-gcc.patch 1599 RMD160 9a23a7db201c8172be7ca12524a2d59fd730ba92 SHA1 4278b2c5327a1ee79895adfe82383b78e1f7af6c SHA256 6f60aef2f23be2a6f92712df89bffbdde447418a490d3a7c791e5e5174737a9e
DIST arch2-5a.tar.gz 19986 RMD160 be62d70a2808c6ac7f0ac967904060ee61d3010a SHA1 05ba5421771026d508cb3f8bef1ac79bcbf12478 SHA256 21810f9ff76d2020768929a134d5c2dd4fd6f35ac699452ee5d5beef19a23ec5
-EBUILD arch-2.5a.ebuild 637 RMD160 4cff6f7be7afe181b5834dc6f86c5fa11807e97b SHA1 d326fd4b76916a0aed1cb394da29cfd0b80512cb SHA256 27d153bf0e034674fba1abb61dc1833e7aeeda9fdda5651bafcd1d37d75d6a90
+EBUILD arch-2.5a.ebuild 638 RMD160 abb5d791fb79d5386bb7dde7906efd590d7855ea SHA1 9d39a28f737f78e78f0fe9efe53e931649d63f61 SHA256 6ce90ce2072d481e41641f0bffedb6a383ecbb79a040db78f5eadb3bdb83e4a2
diff --git a/dev-libs/arch/arch-2.5a.ebuild b/dev-libs/arch/arch-2.5a.ebuild
index 05e7a6c..b83e923 100644
--- a/dev-libs/arch/arch-2.5a.ebuild
+++ b/dev-libs/arch/arch-2.5a.ebuild
@@ -24,7 +24,7 @@ src_prepare() {
epatch "${FILESDIR}/libarch_autotools-gcc.patch"
cp "${FILESDIR}/Makefile.am" .
cp "${FILESDIR}/configure.ac" .
- cp "${FILESDIR}/arch.pc.in" .
+ cp "${FILESDIR}/${PN}.pc.in" .
rm "Makefile"
eautoreconf || die
}
diff --git a/dev-libs/arch/files/Makefile.am b/dev-libs/arch/files/Makefile.am
index ac5e8f7..59e9a0d 100644
--- a/dev-libs/arch/files/Makefile.am
+++ b/dev-libs/arch/files/Makefile.am
@@ -2,6 +2,7 @@ AUTOMAKE_OPTIONS = foreign
lib_LTLIBRARIES = libarch.la
libarch_la_SOURCES = ArchLibError.C Bus.C BusALU.C COSet.C CPUObject.C Clearable.C Clock.C ClockedObject.C Connector.C Constant.C Counter.C Flow.C FlowSet.C InFlow.C Memory.C OutFlow.C PseudoInput.C PseudoOutput.C ShiftRegister.C StorageObject.C
+libarch_la_LDFLAGS = -release @VERSION@
include_HEADERS = ArchLibError.h Bus.h BusALU.h COSet.h CPUObject.h Clearable.h Clock.h ClockedObject.h Connector.h Constant.h Counter.h Flow.h FlowSet.h InFlow.h Memory.h OutFlow.h PseudoInput.h PseudoOutput.h ShiftRegister.h StorageObject.h
pkgconfigdir = $(libdir)/pkgconfig
diff --git a/dev-libs/arch/files/arch.pc.in b/dev-libs/arch/files/arch.pc.in
index 4ebc081..0f0833b 100644
--- a/dev-libs/arch/files/arch.pc.in
+++ b/dev-libs/arch/files/arch.pc.in
@@ -1,4 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
Name: arch
Description: RIT's computer architecture simulation library.
Version: @VERSION@
-Libs: -larch
+Libs: -L${libdir} -larch-@VERSION@
+Cflags: -I${includedir} -I${libdir}/include
diff --git a/dev-libs/arch/files/configure.ac b/dev-libs/arch/files/configure.ac
index c1c88e4..7e9f256 100644
--- a/dev-libs/arch/files/configure.ac
+++ b/dev-libs/arch/files/configure.ac
@@ -1,6 +1,6 @@
-AC_INIT(libarch,2-5a)
+AC_INIT(arch,2.5a)
-AM_INIT_AUTOMAKE(libarch,2-5a)
+AM_INIT_AUTOMAKE(arch,2.5a)
AC_PROG_CC
AC_PROG_CXX