From ceafd0037f102ffbb2b902b6ccb0b9701f3ae1ba Mon Sep 17 00:00:00 2001 From: Javier Sancho Date: Thu, 21 Aug 2014 09:50:57 +0200 Subject: [PATCH] Sources Reorganization --- Makefile.am | 20 ++--------- configure.ac | 7 ++-- guile.am | 1 - src/Makefile.am | 35 +++++++++++++++++++ assimp.scm => src/assimp.scm | 0 {assimp => src/assimp}/low-level.scm | 0 {assimp => src/assimp}/low-level/cimport.scm | 0 {assimp => src/assimp}/low-level/color.scm | 0 {assimp => src/assimp}/low-level/material.scm | 0 {assimp => src/assimp}/low-level/matrix.scm | 0 {assimp => src/assimp}/low-level/mesh.scm | 0 .../assimp}/low-level/postprocess.scm | 0 {assimp => src/assimp}/low-level/scene.scm | 0 {assimp => src/assimp}/low-level/types.scm | 0 {assimp => src/assimp}/low-level/vector.scm | 0 15 files changed, 42 insertions(+), 21 deletions(-) create mode 100644 src/Makefile.am rename assimp.scm => src/assimp.scm (100%) rename {assimp => src/assimp}/low-level.scm (100%) rename {assimp => src/assimp}/low-level/cimport.scm (100%) rename {assimp => src/assimp}/low-level/color.scm (100%) rename {assimp => src/assimp}/low-level/material.scm (100%) rename {assimp => src/assimp}/low-level/matrix.scm (100%) rename {assimp => src/assimp}/low-level/mesh.scm (100%) rename {assimp => src/assimp}/low-level/postprocess.scm (100%) rename {assimp => src/assimp}/low-level/scene.scm (100%) rename {assimp => src/assimp}/low-level/types.scm (100%) rename {assimp => src/assimp}/low-level/vector.scm (100%) diff --git a/Makefile.am b/Makefile.am index a9dc6ef..5ec20c8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,24 +16,8 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . -include guile.am +SUBDIRS = src -moddir=$(prefix)/share/guile/site/$(GUILE_EFFECTIVE_VERSION) -godir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/ccache - -SOURCES = \ - assimp.scm \ - assimp/low-level.scm \ - assimp/low-level/cimport.scm \ - assimp/low-level/color.scm \ - assimp/low-level/material.scm \ - assimp/low-level/matrix.scm \ - assimp/low-level/mesh.scm \ - assimp/low-level/postprocess.scm \ - assimp/low-level/scene.scm \ - assimp/low-level/types.scm \ - assimp/low-level/vector.scm - -EXTRA_DIST += env.in COPYING examples README +EXTRA_DIST = COPYING env.in examples README TESTS_ENVIRONMENT = $(top_builddir)/env $(GUILE) --no-auto-compile diff --git a/configure.ac b/configure.ac index d804de3..9934c25 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,7 @@ along with this program. If not, see . ]) -AC_CONFIG_SRCDIR(assimp.scm) +AC_CONFIG_SRCDIR(src/assimp.scm) AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE([-Wall -Wno-portability foreign]) AM_SILENT_RULES([yes]) @@ -29,7 +29,10 @@ AM_SILENT_RULES([yes]) GUILE_PKG([2.2 2.0]) GUILE_PROGS -AC_CONFIG_FILES([Makefile]) +AC_CHECK_LIB([assimp], [aiImportFile], [], + [AC_MSG_FAILURE([assimp not found (required)])]) + +AC_CONFIG_FILES([Makefile src/Makefile]) AC_CONFIG_FILES([env], [chmod +x env]) AC_OUTPUT diff --git a/guile.am b/guile.am index dc1e63f..085ee77 100644 --- a/guile.am +++ b/guile.am @@ -12,7 +12,6 @@ guile_install_go_files = install-nobase_goDATA $(guile_install_go_files): install-nobase_modDATA CLEANFILES = $(GOBJECTS) -EXTRA_DIST = $(SOURCES) $(NOCOMP_SOURCES) GUILE_WARNINGS = -Wunbound-variable -Warity-mismatch -Wformat SUFFIXES = .scm .go .scm.go: diff --git a/src/Makefile.am b/src/Makefile.am new file mode 100644 index 0000000..aa0c111 --- /dev/null +++ b/src/Makefile.am @@ -0,0 +1,35 @@ +## Process this file with automake to produce Makefile.in. +## +## guile-assimp, foreign interface to libassimp +## Copyright (C) 2014 by Javier Sancho Fernandez +## +## This program is free software: you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program. If not, see . + +include ../guile.am + +moddir=$(prefix)/share/guile/site/$(GUILE_EFFECTIVE_VERSION) +godir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/ccache + +SOURCES = \ + assimp.scm \ + assimp/low-level.scm \ + assimp/low-level/cimport.scm \ + assimp/low-level/color.scm \ + assimp/low-level/material.scm \ + assimp/low-level/matrix.scm \ + assimp/low-level/mesh.scm \ + assimp/low-level/postprocess.scm \ + assimp/low-level/scene.scm \ + assimp/low-level/types.scm \ + assimp/low-level/vector.scm diff --git a/assimp.scm b/src/assimp.scm similarity index 100% rename from assimp.scm rename to src/assimp.scm diff --git a/assimp/low-level.scm b/src/assimp/low-level.scm similarity index 100% rename from assimp/low-level.scm rename to src/assimp/low-level.scm diff --git a/assimp/low-level/cimport.scm b/src/assimp/low-level/cimport.scm similarity index 100% rename from assimp/low-level/cimport.scm rename to src/assimp/low-level/cimport.scm diff --git a/assimp/low-level/color.scm b/src/assimp/low-level/color.scm similarity index 100% rename from assimp/low-level/color.scm rename to src/assimp/low-level/color.scm diff --git a/assimp/low-level/material.scm b/src/assimp/low-level/material.scm similarity index 100% rename from assimp/low-level/material.scm rename to src/assimp/low-level/material.scm diff --git a/assimp/low-level/matrix.scm b/src/assimp/low-level/matrix.scm similarity index 100% rename from assimp/low-level/matrix.scm rename to src/assimp/low-level/matrix.scm diff --git a/assimp/low-level/mesh.scm b/src/assimp/low-level/mesh.scm similarity index 100% rename from assimp/low-level/mesh.scm rename to src/assimp/low-level/mesh.scm diff --git a/assimp/low-level/postprocess.scm b/src/assimp/low-level/postprocess.scm similarity index 100% rename from assimp/low-level/postprocess.scm rename to src/assimp/low-level/postprocess.scm diff --git a/assimp/low-level/scene.scm b/src/assimp/low-level/scene.scm similarity index 100% rename from assimp/low-level/scene.scm rename to src/assimp/low-level/scene.scm diff --git a/assimp/low-level/types.scm b/src/assimp/low-level/types.scm similarity index 100% rename from assimp/low-level/types.scm rename to src/assimp/low-level/types.scm diff --git a/assimp/low-level/vector.scm b/src/assimp/low-level/vector.scm similarity index 100% rename from assimp/low-level/vector.scm rename to src/assimp/low-level/vector.scm -- 2.39.2