Attachment 597318 Details for Bug 787713 – Remaining parts of Rallf's patch + my patch in comment #39 - Makefile.am

[patch] Remaining parts of Rallf's patch + my patch in comment #39 - Makefile.am

freesolid-2-1-1-makefile-am-up (text/plain), 1.75 KB, created by Alec Leamas on 2012-07-10 11:52:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alec Leamas

Created: 2012-07-10 11:52:57 UTC

Size: 1.75 KB

patch

obsolete

>FreeSOLID-2.1.1-Makefile.am-update.patch
>
>From: Alec Leamas <alec@tests.notat.diaspora.com>
>
>
>---
>
> Makefile.am          |   20 ++++++++++++++++++--
> libsolid/Makefile.am |    2 +-
> 2 files changed, 19 insertions(+), 3 deletions(-)
>
>
>diff --git a/Makefile.am b/Makefile.am
>index 27a736c..2a817bf 100644
>--- a/Makefile.am
>+++ b/Makefile.am
>@@ -1,8 +1,24 @@
> ACLOCAL_AMFLAGS = -I m4
> SUBDIRS = libmoto libbroad libsolid sample doc
> 
>-EXTRA_DIST = include FreeSOLID.pc.in
>+EXTRA_DIST = FreeSOLID.pc.in
> bin_SCRIPTS = freesolid-config
> 
> pkgconfigdir         = $(libdir)/pkgconfig
>-dist_pkgconfig_DATA  = FreeSOLID.pc
>+nodist_pkgconfig_DATA  = FreeSOLID.pc
>+
>+FreeSOLID_3Ddir = $(includedir)/FreeSOLID/3D
>+FreeSOLID_3D_HEADERS =
>+FreeSOLID_3D_HEADERS += include/3D/Basic.h
>+FreeSOLID_3D_HEADERS += include/3D/Matrix.h
>+FreeSOLID_3D_HEADERS += include/3D/Point.h
>+FreeSOLID_3D_HEADERS += include/3D/Quaternion.h
>+FreeSOLID_3D_HEADERS += include/3D/Tuple3.h
>+FreeSOLID_3D_HEADERS += include/3D/Tuple4.h
>+FreeSOLID_3D_HEADERS += include/3D/Vector.h
>+
>+FreeSOLID_SOLIDdir = $(includedir)/FreeSOLID/SOLID
>+FreeSOLID_SOLID_HEADERS =
>+FreeSOLID_SOLID_HEADERS += include/SOLID/solid.h
>+FreeSOLID_SOLID_HEADERS += include/SOLID/broad.h
>+FreeSOLID_SOLID_HEADERS += include/SOLID/types.h
>diff --git a/libsolid/Makefile.am b/libsolid/Makefile.am
>index f722be3..623b2e8 100644
>--- a/libsolid/Makefile.am
>+++ b/libsolid/Makefile.am
>@@ -21,7 +21,7 @@ libFreeSOLID_la_SOURCES = \
> 	../libmoto/MT_Vector4.cpp
> 
> 
>-libFreeSOLID_la_LDFLAGS = -no-undefined -version-info @FREESOLID_CURRENT@:@FREESOLID_REVISION@:@FREESOLID_AGE@ -release @VERSION@
>+libFreeSOLID_la_LDFLAGS = -no-undefined -version-info @FREESOLID_CURRENT@:@FREESOLID_REVISION@:@FREESOLID_AGE@ 
> 
> AM_CPPFLAGS = @CPPFLAGS@
> LIBS = @QHULL_LIBS@ -lm

Actions: View | Diff

Attachments on bug 787713: 571351 | 571691 | 571692 | 596979 | 596980 | 596981 | 597182 | 597228 | 597255 | 597316 | 597317 | 597318 | 597320 | 597414 | 597429