]>
Commit | Line | Data |
---|---|---|
dfbbd1ec | 1 | --- src/x11/Makefile.am~ 2005-01-13 17:12:35.000000000 +0000 |
2 | +++ src/x11/Makefile.am 2005-06-08 15:09:32.840822480 +0000 | |
3 | @@ -10,7 +10,7 @@ | |
4 | JPEGLIB = @top_builddir@/libs/libjpeg6b/libjpeg.a | |
5 | endif | |
6 | ||
7 | -INCLUDES=-I@top_srcdir@/libs/libFreeMat -I@top_srcdir@/libs/libCore -I@top_srcdir@/libs/libFN -I@top_srcdir@/libs/libGraphics -I@top_builddir@/libs/libffi/include -I@top_srcdir@/libs/libXP -I@top_srcdir@/libs/libFLTK | |
8 | +INCLUDES=-I@top_srcdir@/libs/libFreeMat -I@top_srcdir@/libs/libCore -I@top_srcdir@/libs/libFN -I@top_srcdir@/libs/libGraphics -I@top_srcdir@/libs/libXP -I@top_srcdir@/libs/libFLTK | |
9 | ||
10 | bin_PROGRAMS = FreeMat | |
11 | ||
12 | @@ -20,5 +20,5 @@ | |
13 | Terminal.cpp \ | |
14 | Terminal.hpp | |
15 | ||
16 | -FreeMat_DEPENDENCIES = @top_builddir@/libs/libCore/libCore.a @top_builddir@/libs/libFN/libFN.a @top_builddir@/libs/libGraphics/libGraphics.a @top_builddir@/libs/libFreeMat/libFreeMat.a @top_builddir@/libs/libARPACK/libARPACK.a @top_builddir@/libs/libUMFPACK/UMFPACK/libUMFPACKdi.a @top_builddir@/libs/libUMFPACK/UMFPACK/libUMFPACKzi.a @top_builddir@/libs/libUMFPACK/AMD/libAMD.a @top_builddir@/libs/libFFTPack/libFFTPack.a @top_builddir@/libs/libffi/libffi.a @top_builddir@/libs/libXP/libXP.a $(PNGLIB) $(TIFFLIB) $(JPEGLIB) @top_builddir@/libs/libFLTK/libFLTK.a | |
17 | -FreeMat_LDADD = @top_builddir@/libs/libCore/libCore.a @top_builddir@/libs/libFN/libFN.a @top_builddir@/libs/libGraphics/libGraphics.a @top_builddir@/libs/libFreeMat/libFreeMat.a @top_builddir@/libs/libARPACK/libARPACK.a @top_builddir@/libs/libUMFPACK/UMFPACK/libUMFPACKdi.a @top_builddir@/libs/libUMFPACK/UMFPACK/libUMFPACKzi.a @top_builddir@/libs/libUMFPACK/AMD/libAMD.a @top_builddir@/libs/libFFTPack/libFFTPack.a @top_builddir@/libs/libffi/libffi.a @top_builddir@/libs/libXP/libXP.a @top_builddir@/libs/libFLTK/libFLTK.a $(PNGLIB) $(TIFFLIB) $(JPEGLIB) @X_PRE_LIBS@ @X_LIBS@ -lX11 @X_EXTRA_LIBS@ -L/sw/lib -lg2c | |
18 | +FreeMat_DEPENDENCIES = @top_builddir@/libs/libCore/libCore.a @top_builddir@/libs/libFN/libFN.a @top_builddir@/libs/libGraphics/libGraphics.a @top_builddir@/libs/libFreeMat/libFreeMat.a @top_builddir@/libs/libARPACK/libARPACK.a @top_builddir@/libs/libUMFPACK/UMFPACK/libUMFPACKdi.a @top_builddir@/libs/libUMFPACK/UMFPACK/libUMFPACKzi.a @top_builddir@/libs/libUMFPACK/AMD/libAMD.a @top_builddir@/libs/libFFTPack/libFFTPack.a @top_builddir@/libs/libXP/libXP.a $(PNGLIB) $(TIFFLIB) $(JPEGLIB) @top_builddir@/libs/libFLTK/libFLTK.a | |
19 | +FreeMat_LDADD = @top_builddir@/libs/libCore/libCore.a @top_builddir@/libs/libFN/libFN.a @top_builddir@/libs/libGraphics/libGraphics.a @top_builddir@/libs/libFreeMat/libFreeMat.a @top_builddir@/libs/libARPACK/libARPACK.a @top_builddir@/libs/libUMFPACK/UMFPACK/libUMFPACKdi.a @top_builddir@/libs/libUMFPACK/UMFPACK/libUMFPACKzi.a @top_builddir@/libs/libUMFPACK/AMD/libAMD.a @top_builddir@/libs/libFFTPack/libFFTPack.a @top_builddir@/libs/libXP/libXP.a @top_builddir@/libs/libFLTK/libFLTK.a $(PNGLIB) $(TIFFLIB) $(JPEGLIB) @X_PRE_LIBS@ @X_LIBS@ -lX11 @X_EXTRA_LIBS@ -L/sw/lib -lg2c -lffi | |
20 | --- libs/Makefile.am~ 2004-12-07 20:13:47.000000000 +0000 | |
21 | +++ libs/Makefile.am 2005-06-08 15:10:56.993029400 +0000 | |
22 | @@ -15,7 +15,7 @@ | |
23 | endif | |
24 | ||
25 | SUBDIRS = libFreeMat libFFTPack libCore libGraphics libXP \ | |
26 | - $(BLAS_DIR) libMiniLAPACK libffi libf2c $(JPEG_DIR) \ | |
27 | + $(BLAS_DIR) libMiniLAPACK libf2c $(JPEG_DIR) \ | |
28 | $(TIFF_DIR) $(PNG_DIR) libFN libFLTK libUMFPACK libARPACK | |
29 | ||
30 | AUTOMAKE_OPTIONS = foreign |