cibles tests changee
Jean-philippe Chancelier [Wed, 17 Oct 2001 08:03:48 +0000 (08:03 +0000)]
scilab/config/Makefile.aix
scilab/config/Makefile.ultrix
scilab/config/Makeso.incl.in

index fddd5f6..acc9a58 100755 (executable)
@@ -15,7 +15,7 @@ bin/scilex: scilex-lib
                $(RM) /tmp/scilex-1;\
                $(LLD) $(DEFAULTS) $(LIBR) $(LD_LDFLAGS) $(TCLTK_LIBS) \
                        $(XLIBS) $(TERMCAPLIB) $(LLDLF);\
-               (echo "#!$(SCIDIR)/bin/scilex"; /usr/bin/nm -p -gp /tmp/scilex-1\
+               (echo "#!$(SCIDIR)/bin/scilex"; /usr/bin/nm -B -gp /tmp/scilex-1\
                        | sed -n -e '/.* T \./s///p' -e '/.* [DB] /s///p' \
                        | sort -u) > bin/scilex.exp ;\
                $(RM) /tmp/scilex-1 ;\
index 67ad50d..684473a 100755 (executable)
@@ -14,7 +14,7 @@ bin/scilex: scilex-lib
                echo "linking";\
                $(FC) -o $@ $(DEFAULTS) $(LIBR) $(FC_LDFLAGS) $(TCLTK_LIBS) \
                        $(XLIBS) $(TERMCAPLIB)  ;\
-               /usr/bin/nm -p $@ > $@.nm;\
+               /usr/bin/nm -B $@ > $@.nm;\
                grep ' T ' $@.nm > $@.txtnm;\
                grep ' [A-SU-Z] ' $@.nm > $@.datnm;\
                rm $@.nm;\
index ec0592f..71a7d01 100644 (file)
@@ -64,7 +64,8 @@ distclean:: clean
 tests  : $(LIBRARY_NAME).dia
 
 $(LIBRARY_NAME).dia    : $(LIBRARY_NAME).la $(LIBRARY_NAME).tst
-       @$(SCIDIR)/util/scidem $(SCIDIR) $(LIBRARY_NAME).tst $(LIBRARY_NAME).dia
+       @$(SCIDIR)/bin/scilab -nw -e "scitest(\"$(LIBRARY_NAME).tst\");quit;"
+
 
 .c.o:
        @echo "compiling $<"