Commit e8aa1fe4 authored by Erwan Jahier's avatar Erwan Jahier
Browse files

nop

parents f8e62e98 febe4220
......@@ -29,7 +29,7 @@ lutin-man.pdf: objs/main.pdf
cp $< $@
./objs/lutin.tex: objs
lutin -help > $@
lutin$(EXE) -help > $@
# XXX ecrire un filtre pour rajouter de la coloration syntaxique !!
./objs/foo.c.tex:
......@@ -40,7 +40,7 @@ lutin-man.pdf: objs/main.pdf
$(LUT2TEX) ../../examples/lutin/external_code/call_external_c_code.lut > ./objs/call_external_c_code.lut.tex
./objs/ud.jpg:
gnuplot-rif -jpg ../../examples/lutin/up_and_down/test.rif.exp
gnuplot-rif$(EXE) -jpg ../../examples/lutin/up_and_down/test.rif.exp
mv ../../examples/lutin/up_and_down/test.rif.jpg objs/ud.jpg
......@@ -55,10 +55,10 @@ lutin-man.pdf: objs/main.pdf
./objs/gnuplotrif.tex:objs
gnuplot-rif --help 1> $@
gnuplot-rif$(EXE) --help 1> $@
./objs/checkrif.tex:objs
check-rif --help 1> $@
check-rif$(EXE) --help 1> $@
touch.tex:
......
......@@ -562,12 +562,15 @@ ACROREAD
GV
DOT
GNUPLOT
<<<<<<< HEAD
WIN32LIB
NOCYGWIN
LINKER
LDL
LIB_GC
PIXMAP_DIR
=======
>>>>>>> febe4220e013b971aebf317b94d02713290a54f0
OBJEXT
EXEEXT
ac_ct_CC
......@@ -575,6 +578,7 @@ CPPFLAGS
LDFLAGS
CFLAGS
CC
<<<<<<< HEAD
SCADE_INSTALL_DIR
SCADE2LUSTRE
SCADE
......@@ -582,12 +586,22 @@ SCADE_CG
LUSTRE2C
S2L
SCADE2LUSTREBIN
=======
>>>>>>> febe4220e013b971aebf317b94d02713290a54f0
EC2C
LUS2EC
LUS2LIC
MORE_LIB
MORE_INCLUDE
<<<<<<< HEAD
SCADE_OS_NAME
=======
WIN32LIB
NOCYGWIN
LINKER
LDL
LIB_GC
>>>>>>> febe4220e013b971aebf317b94d02713290a54f0
LURETTEPATH
HOST_TYPE
target_alias
......@@ -1857,7 +1871,11 @@ unset LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME
case `./config.guess` in
i*86-pc-linux-*) HOST_TYPE=linux ;;
sparc-sun-solaris2.*) HOST_TYPE=sparc-sun ;;
<<<<<<< HEAD
i*86-*-cygwin) HOST_TYPE=cygwin ;;
=======
i*86-*-cygwin) HOST_TYPE=win32 ;;
>>>>>>> febe4220e013b971aebf317b94d02713290a54f0
i*86-apple*) HOST_TYPE=mac ;;
*) as_fn_error $? "Unsupported architecture" "$LINENO" 5 ;;
esac
......@@ -1964,8 +1982,50 @@ CYGWIN*)
esac
<<<<<<< HEAD
SCADE_OS_NAME=$V_WHOAMI
=======
#-----------------------------------------------------------------------------#
EXE=
case "$HOST_TYPE" in
sparc-sun)
LDL="-lsocket -lnsl -ldl -lstdc++"
NOCYGWIN=
WIN32LIB=
LINKER=gcc
;;
cygwin)
LDL="-ldl -lstdc++"
NOCYGWIN=
WIN32LIB=
LINKER=gcc
;;
win32)
LDL="-ldl -lstdc++"
NOCYGWIN=-mno-cygwin
WIN32LIB=-lws2_32
LINKER=gcc
EXE=.exe
;;
mac)
LIB_GC=
LDL=-ldl
NOCYGWIN=
WIN32LIB=
LINKER=g++
;;
*)
LIB_GC=
LDL="-ldl -lstdc++"
NOCYGWIN=
WIN32LIB=
LINKER=gcc
esac
>>>>>>> febe4220e013b971aebf317b94d02713290a54f0
......@@ -1996,6 +2056,7 @@ fi
LUS2LIC=lus2lic$EXE
LUS2EC=lus2ec$EXE
<<<<<<< HEAD
EC2C=ec2c$ EXE
......@@ -2404,6 +2465,9 @@ $as_echo "$as_me: WARNING: *** Cannot find scade_cg the scade compiler." >&2;}
fi
;;
esac
=======
EC2C=ec2c$EXE
>>>>>>> febe4220e013b971aebf317b94d02713290a54f0
......@@ -3458,6 +3522,7 @@ fi
#AC_CHECK_FUNC(gethostent, , AC_CHECK_LIB(nsl, gethostent))
# AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt))
<<<<<<< HEAD
#-----------------------------------------------------------------------------#
PIXMAP_DIR="$LURETTEPATH"/bin/pixmaps/
......@@ -3519,6 +3584,8 @@ esac
=======
>>>>>>> febe4220e013b971aebf317b94d02713290a54f0
#-----------------------------------------------------------------------------#
# Misc tools
......@@ -4999,7 +5066,10 @@ fi
# if the user ask to install files in a other place.
test -d $LURETTEPATH/bin/ || (echo "Creating $LURETTEPATH/bin/..." && mkdir $LURETTEPATH/bin)
<<<<<<< HEAD
test -d $LURETTEPATH/bin/pixmaps || (echo "Creating $LURETTEPATH/bin/pixmaps..." && mkdir $LURETTEPATH/bin/pixmaps)
=======
>>>>>>> febe4220e013b971aebf317b94d02713290a54f0
test -d $LURETTEPATH/lib/ || (echo "Creating $LURETTEPATH/lib/..." && mkdir $LURETTEPATH/lib)
test -d $LURETTEPATH/include/ || (echo "Creating $LURETTEPATH/include/..." && mkdir $LURETTEPATH/include )
......@@ -6194,8 +6264,11 @@ install -m a+x,a+r,u+w ./lurettetop.sh "$LURETTEPATH/bin/lurettetop"
install -m a+x,a+r,u+w ./show_luc.sh "$LURETTEPATH/bin/show_luc"
install -m a+x,a+r,u+w ./xlurette.sh "$LURETTEPATH/bin/xlurette"
install -m a+x,a+r,u+w ./gen_stubs.sh "$LURETTEPATH/bin/gen_stubs"
<<<<<<< HEAD
install -D -v ./pixmaps/* "$PIXMAP_DIR"
=======
>>>>>>> febe4220e013b971aebf317b94d02713290a54f0
install ./set_env_var "$LURETTEPATH/bin"
......
......@@ -122,7 +122,6 @@ $(LURETTE_RELEASE_NAME).tgz: strip
\
cp -f $(LURETTE_PATH)/$(HOSTTYPE)/lib/rif_base.* /tmp/$(LURETTE_RELEASE_NAME)/lib
cp -f $(LURETTE_PATH)/$(HOSTTYPE)/lib/ocamlRM.* /tmp/$(LURETTE_RELEASE_NAME)/lib
cp -f $(LURETTE_PATH)/$(HOSTTYPE)/lib/liblurette_nc.a /tmp/$(LURETTE_RELEASE_NAME)/lib
cp -f $(LURETTE_PATH)/$(HOSTTYPE)/lib/liblucky_nc.a /tmp/$(LURETTE_RELEASE_NAME)/lib
\
cp $(LURETTE_PATH)/doc/figs/lurette-v3.pdf /tmp/$(LURETTE_RELEASE_NAME)/doc/
......@@ -203,7 +202,7 @@ $(LUCKY_RELEASE_NAME).tgz:strip
mkdir /tmp/$(LUCKY_RELEASE_NAME)/utils
mkdir /tmp/$(LUCKY_RELEASE_NAME)/include
mkdir /tmp/$(LUCKY_RELEASE_NAME)/doc
cp $(LURETTE_PATH)/$(HOSTTYPE)/lib/* /tmp/$(LUCKY_RELEASE_NAME)/lib
cp -rf $(LURETTE_PATH)/$(HOSTTYPE)/lib/* /tmp/$(LUCKY_RELEASE_NAME)/lib
cp -rf $(LURETTE_PATH)/$(HOSTTYPE)/include /tmp/$(LUCKY_RELEASE_NAME)/include
cp $(LURETTE_PATH)/$(HOSTTYPE)/bin/lucky$(EXE) /tmp/$(LUCKY_RELEASE_NAME)/bin/
cp $(LURETTE_PATH)/utils/lucky_cpp /tmp/$(LUCKY_RELEASE_NAME)/utils
......@@ -403,8 +402,12 @@ update-lucky-man:
update-man: update-lutin-man update-lurette-man update-lucky-man
ifeq ($(HOSTTYPE),win32)
rel: lurette-rel lutin-rel draw-rel luc4ocaml-rel luc4c-rel rel_nodep
else
rel: update-man lurette-rel lutin-rel draw-rel luc4ocaml-rel luc4c-rel rel_nodep
endif
rel_nodep:$(ALL_RELEASE_NAME).tgz
$(ALL_RELEASE_NAME).tgz:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment