summaryrefslogtreecommitdiffstats
path: root/scilab/modules
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2009-09-10 14:14:42 +0200
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2009-09-10 14:14:42 +0200
commit92beb77d71bad1d6992cbcf85a43bcfcdaf15923 (patch)
tree0c28d59ede24b4ab443094e1af7fe544b4f576c3 /scilab/modules
parent9b50b949b44014c283005ade671903071739a3b6 (diff)
downloadscilab-92beb77d71bad1d6992cbcf85a43bcfcdaf15923.zip
scilab-92beb77d71bad1d6992cbcf85a43bcfcdaf15923.tar.gz
Use no-gui when --without-gui is used
Diffstat (limited to 'scilab/modules')
-rw-r--r--scilab/modules/Makefile.am8
-rw-r--r--scilab/modules/Makefile.in13
2 files changed, 15 insertions, 6 deletions
diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am
index 58a7d92..973d946 100644
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -197,7 +197,13 @@ endif
197# Dev in progress 197# Dev in progress
198 198
199# Core modules 199# Core modules
200libscilab_la_LIBADD = $(ENGINE_LIBS) $(GUI_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS) 200libscilab_la_LIBADD = $(ENGINE_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS)
201
202if GUI
203libscilab_la_LIBADD += $(GUI_LIBS)
204else
205libscilab_la_LIBADD += $(NO_GUI_LIBS)
206endif
201 207
202# Core modules 208# Core modules
203libscilab_cli_la_LIBADD = $(ENGINE_LIBS) $(NO_GUI_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS) 209libscilab_cli_la_LIBADD = $(ENGINE_LIBS) $(NO_GUI_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS)
diff --git a/scilab/modules/Makefile.in b/scilab/modules/Makefile.in
index 029d243..5abf174 100644
--- a/scilab/modules/Makefile.in
+++ b/scilab/modules/Makefile.in
@@ -60,7 +60,9 @@ host_triplet = @host@
60# Don't forget that the order in subdirs does matter !!! 60# Don't forget that the order in subdirs does matter !!!
61@JAVASCI_TRUE@am__append_2 = javasci 61@JAVASCI_TRUE@am__append_2 = javasci
62@SCICOS_TRUE@am__append_3 = $(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la 62@SCICOS_TRUE@am__append_3 = $(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la
63@ENABLE_STATIC_TRUE@am__append_4 = $(ALL_LIBS) 63@GUI_TRUE@am__append_4 = $(GUI_LIBS)
64@GUI_FALSE@am__append_5 = $(NO_GUI_LIBS)
65@ENABLE_STATIC_TRUE@am__append_6 = $(ALL_LIBS)
64subdir = modules 66subdir = modules
65DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in 67DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
66ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 68ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -114,8 +116,9 @@ libscilab_cli_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
114 $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ 116 $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
115 $(libscilab_cli_la_LDFLAGS) $(LDFLAGS) -o $@ 117 $(libscilab_cli_la_LDFLAGS) $(LDFLAGS) -o $@
116am__DEPENDENCIES_1 = 118am__DEPENDENCIES_1 =
117libscilab_la_DEPENDENCIES = $(ENGINE_LIBS) $(GUI_LIBS) $(OTHER_LIBS) \ 119libscilab_la_DEPENDENCIES = $(ENGINE_LIBS) $(OTHER_LIBS) \
118 $(EXTERNAL_LIBS) $(am__DEPENDENCIES_1) 120 $(EXTERNAL_LIBS) $(am__append_4) $(am__append_5) \
121 $(am__DEPENDENCIES_1)
119am_libscilab_la_OBJECTS = 122am_libscilab_la_OBJECTS =
120libscilab_la_OBJECTS = $(am_libscilab_la_OBJECTS) 123libscilab_la_OBJECTS = $(am_libscilab_la_OBJECTS)
121libscilab_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ 124libscilab_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -518,8 +521,8 @@ OTHER_LIBS = $(top_builddir)/modules/fftw/libscifftw.la \
518# Dev in progress 521# Dev in progress
519 522
520# Core modules 523# Core modules
521libscilab_la_LIBADD = $(ENGINE_LIBS) $(GUI_LIBS) $(OTHER_LIBS) \ 524libscilab_la_LIBADD = $(ENGINE_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS) \
522 $(EXTERNAL_LIBS) $(am__append_4) 525 $(am__append_4) $(am__append_5) $(am__append_6)
523 526
524# Core modules 527# Core modules
525libscilab_cli_la_LIBADD = $(ENGINE_LIBS) $(NO_GUI_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS) 528libscilab_cli_la_LIBADD = $(ENGINE_LIBS) $(NO_GUI_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS)