summaryrefslogtreecommitdiffstats
path: root/scilab/modules/Makefile.am
diff options
context:
space:
mode:
Diffstat (limited to 'scilab/modules/Makefile.am')
-rw-r--r--scilab/modules/Makefile.am11
1 files changed, 3 insertions, 8 deletions
diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am
index 3d1f186..86be6b0 100644
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -130,11 +130,9 @@ GUI_LIBS = $(top_builddir)/modules/gui/libscigui.la \
130 $(top_builddir)/modules/graphic_export/libscigraphic_export.la \ 130 $(top_builddir)/modules/graphic_export/libscigraphic_export.la \
131 $(top_builddir)/modules/console/libsciconsole.la \ 131 $(top_builddir)/modules/console/libsciconsole.la \
132 $(top_builddir)/modules/jvm/libscijvm.la \ 132 $(top_builddir)/modules/jvm/libscijvm.la \
133<<<<<<< HEAD:scilab/modules/Makefile.am 133 $(top_builddir)/modules/xcos/libscixcos.la \
134 $(top_builddir)/modules/xcos/libscixcos.la
135=======
136 $(top_builddir)/modules/xpad/libscixpad.la 134 $(top_builddir)/modules/xpad/libscixpad.la
137>>>>>>> origin/master:scilab/modules/Makefile.am 135
138 136
139NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \ 137NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \
140 $(top_builddir)/modules/renderer/libscirenderer-disable.la \ 138 $(top_builddir)/modules/renderer/libscirenderer-disable.la \
@@ -142,11 +140,8 @@ NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \
142 $(top_builddir)/modules/graphic_export/libscigraphic_export-disable.la \ 140 $(top_builddir)/modules/graphic_export/libscigraphic_export-disable.la \
143 $(top_builddir)/modules/console/libsciconsole-disable.la \ 141 $(top_builddir)/modules/console/libsciconsole-disable.la \
144 $(top_builddir)/modules/jvm/libscijvm-disable.la \ 142 $(top_builddir)/modules/jvm/libscijvm-disable.la \
145<<<<<<< HEAD:scilab/modules/Makefile.am 143 $(top_builddir)/modules/xcos/libscixcos-disable.la \
146 $(top_builddir)/modules/xcos/libscixcos-disable.la
147=======
148 $(top_builddir)/modules/xpad/libscixpad-disable.la 144 $(top_builddir)/modules/xpad/libscixpad-disable.la
149>>>>>>> origin/master:scilab/modules/Makefile.am
150 145
151ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \ 146ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \
152 $(top_builddir)/modules/mexlib/libmex.la \ 147 $(top_builddir)/modules/mexlib/libmex.la \