From 39aac106c500f81c98f588762f306be6201f11ea Mon Sep 17 00:00:00 2001 From: rlar Date: Sat, 15 Jan 2011 22:08:06 +0000 Subject: [PATCH] updates for the make infrastructure (trannoise and tests/xspice) --- ChangeLog | 10 ++++++++++ src/frontend/trannoise/Makefile.am | 4 +++- src/include/Makefile.am | 4 ++++ src/maths/fft/Makefile.am | 6 +++++- src/maths/fft/{Read Me => Read-Me} | 0 tests/Makefile.am | 3 ++- 6 files changed, 24 insertions(+), 3 deletions(-) rename src/maths/fft/{Read Me => Read-Me} (100%) diff --git a/ChangeLog b/ChangeLog index f72718326..0b31143a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2011-01-15 Robert Larice + * src/frontend/trannoise/Makefile.am , + * src/include/Makefile.am , + * src/maths/fft/Makefile.am , + * tests/Makefile.am , + * src/maths/fft/Read\ Me , + * src/maths/fft/Read-Me : + updates for the make infrastructure (trannoise and tests/xspice) + renamed "Read Me" to avoid whitespace in the filename + 11-01-13 Dietmar Warning * devices/adms/admst/*.xml: set version parameter to 2.3.0 to come in line with admsXml diff --git a/src/frontend/trannoise/Makefile.am b/src/frontend/trannoise/Makefile.am index 6d200ef5b..616a20465 100644 --- a/src/frontend/trannoise/Makefile.am +++ b/src/frontend/trannoise/Makefile.am @@ -1,9 +1,11 @@ +EXTRA_DIST = 1-f-code_d.c + noinst_LTLIBRARIES = libtrannoise.la libtrannoise_la_SOURCES = \ FastNorm3.c \ 1-f-code.c \ - wallace.c + wallace.c AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/frontend diff --git a/src/include/Makefile.am b/src/include/Makefile.am index e18eca4b2..838e26c99 100644 --- a/src/include/Makefile.am +++ b/src/include/Makefile.am @@ -111,6 +111,10 @@ noinst_HEADERS = \ twomesh.h \ typedefs.h \ wordlist.h \ + 1-f-code.h \ + FastNorm3.h \ + fftext.h \ + wallace.h \ wstdio.h MAINTAINERCLEANFILES = Makefile.in diff --git a/src/maths/fft/Makefile.am b/src/maths/fft/Makefile.am index 5f362c403..994d4bf2e 100644 --- a/src/maths/fft/Makefile.am +++ b/src/maths/fft/Makefile.am @@ -4,9 +4,13 @@ noinst_LTLIBRARIES = libmathfft.la libmathfft_la_SOURCES = \ fftext.c \ + fftext.h \ fftlib.c \ - matlib.c + fftlib.h \ + matlib.c \ + matlib.h +EXTRA_DIST = NOTE Read-Me AM_CPPFLAGS = -I$(top_srcdir)/src/include diff --git a/src/maths/fft/Read Me b/src/maths/fft/Read-Me similarity index 100% rename from src/maths/fft/Read Me rename to src/maths/fft/Read-Me diff --git a/tests/Makefile.am b/tests/Makefile.am index b5d105882..51f8e12dd 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -49,9 +49,10 @@ DIST_SUBDIRS = bsim1 \ if XSPICE_WANTED SUBDIRS += xspice -DIST_SUBDIRS += xspice endif +DIST_SUBDIRS += xspice + TESTS_ENVIRONMENT = $(SHELL) $(top_srcdir)/tests/bin/check.sh $(top_builddir)/src/ngspice EXTRA_DIST = \