| 1 |
commit: 9c197d34c69068f5729c7f1ace16ee0c54e6ab9f |
| 2 |
Author: Dane Smith <c1pher <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Feb 23 15:54:15 2011 +0000 |
| 4 |
Commit: Dane Smith <c1pher <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 23 15:54:15 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=commit;h=9c197d34 |
| 7 |
|
| 8 |
Fix makefile. |
| 9 |
|
| 10 |
--- |
| 11 |
dev-util/ati-stream-sdk/Manifest | 3 ++- |
| 12 |
dev-util/ati-stream-sdk/files/Makefile | 15 +++++---------- |
| 13 |
2 files changed, 7 insertions(+), 11 deletions(-) |
| 14 |
|
| 15 |
diff --git a/dev-util/ati-stream-sdk/Manifest b/dev-util/ati-stream-sdk/Manifest |
| 16 |
index fe7287f..a4e667f 100644 |
| 17 |
--- a/dev-util/ati-stream-sdk/Manifest |
| 18 |
+++ b/dev-util/ati-stream-sdk/Manifest |
| 19 |
@@ -1,4 +1,5 @@ |
| 20 |
-AUX Makefile 1756 RMD160 59626766f44c60c064baf25817f11fa51fa7a43b SHA1 da033443bad9eb870bdd6023cfe8ed3e7ae9e173 SHA256 40372466777f3e9269e2ea8a54b3ad2906a8f64299568cecfb56be574e7a1064 |
| 21 |
+AUX Makefile 1701 RMD160 d77ac41fc9c2487af57b8b2fd5d5bbc754e0770e SHA1 a85e86cd5a94dae546508ac8de16ad417d380ec0 SHA256 50e2defb2c842b80922abb078fc8a38c071dc1fed6c7e780af11db52bb266576 |
| 22 |
+AUX Makefile.old 1756 RMD160 59626766f44c60c064baf25817f11fa51fa7a43b SHA1 da033443bad9eb870bdd6023cfe8ed3e7ae9e173 SHA256 40372466777f3e9269e2ea8a54b3ad2906a8f64299568cecfb56be574e7a1064 |
| 23 |
DIST ati-stream-sdk-v2.3-lnx32.tgz 49912168 RMD160 07c045de3118531472672e9ef7b3763cb32f7d68 SHA1 972bdbe6942e52411a2f041720348e857f17c388 SHA256 07fd15a51a678c4378767f61466daf9da21d0bab6088a97a70136dd8c976aca6 |
| 24 |
DIST ati-stream-sdk-v2.3-lnx64.tgz 78659015 RMD160 57af36f62e590ae54cb9d43b880735979b77466c SHA1 43c94e5126563fe3fa4cb92fb6dd20f12864a86d SHA256 f92537d1fc306af0bff1441af4669bf2fa668654b12d9fb53a3a872dc8826cad |
| 25 |
EBUILD ati-stream-sdk-2.3-r1.ebuild 1692 RMD160 a2acb27a3b095ff67427243f9eef5b11cccff482 SHA1 e471885ebd5ddb249c8f20ee167ee610203178df SHA256 7d2637c6013f7b1a4629d897de299bccac48bda5577362c6fb9f43a1fb026dce |
| 26 |
|
| 27 |
diff --git a/dev-util/ati-stream-sdk/files/Makefile b/dev-util/ati-stream-sdk/files/Makefile |
| 28 |
index ae36468..5396f6f 100644 |
| 29 |
--- a/dev-util/ati-stream-sdk/files/Makefile |
| 30 |
+++ b/dev-util/ati-stream-sdk/files/Makefile |
| 31 |
@@ -12,8 +12,7 @@ MKDIR=mkdir -p |
| 32 |
ARCH:=x86 |
| 33 |
BINFILES=bin/x86$(DSUFX)/clc |
| 34 |
LIBFILES=lib/x86$(DSUFX)/libOpenCL.so lib/x86$(DSUFX)/libatiolc$(SUFX).so lib/x86$(DSUFX)/libGLEW.so lib/gpu/builtins-7xx.bc lib/gpu/builtins-evergreen.bc lib/gpu/builtins-gpucommon.bc lib/x86$(DSUFX)/builtins-x86$(DSUFX).bc |
| 35 |
-INCDIRS=include/CL include/GL include/OVDecode |
| 36 |
-INCFILES=include/cal*.h |
| 37 |
+INCFILES=include/cal*.h include/CL/* include/GL/* include/OVDecode/* |
| 38 |
|
| 39 |
ifeq ($(ARCH),amd64) |
| 40 |
DSUFX=_64 |
| 41 |
@@ -44,16 +43,12 @@ install: |
| 42 |
$(INSTALLBIN) "$$f" "$(LIBDIR)$$f1" || exit 1;\ |
| 43 |
else :; fi;\ |
| 44 |
done |
| 45 |
- @list='$(INCDIRS)'; for f in $$list; do\ |
| 46 |
- if test -d $$f; then\ |
| 47 |
- f1=`basename $$f`;\ |
| 48 |
- echo "$(INSTALLDIR) $$f $(INCDIR)$$f1";\ |
| 49 |
- $(INSTALLDIR) $$f $(INCDIR)$$f1 || exit 1;\ |
| 50 |
- else :; fi;\ |
| 51 |
- done |
| 52 |
@list='$(INCFILES)'; for f in $$list; do\ |
| 53 |
if test -f $$f; then\ |
| 54 |
- f1=`basename $$f`;\ |
| 55 |
+ f1=`echo $$f | sed -e 's|include||g'`;\ |
| 56 |
+ base=`basename $$f1`;\ |
| 57 |
+ dir=`echo $$f1 | sed -e "s|$$base||g`;\ |
| 58 |
+ test -z "$(INCDIR)$$dir" || $(MKDIR) "$(INCDIR)$$dir";\ |
| 59 |
echo "$(INSTALLDAT) $$f $(INCDIR)$$f1";\ |
| 60 |
$(INSTALLDAT) $$f $(INCDIR)$$f1 || exit 1;\ |
| 61 |
else :; fi;\ |
Archives