=================================================================== RCS file: /home/cvs/OpenXM/src/kxx/Makefile.in,v retrieving revision 1.25 retrieving revision 1.40 diff -u -p -r1.25 -r1.40 --- OpenXM/src/kxx/Makefile.in 2003/09/08 01:22:56 1.25 +++ OpenXM/src/kxx/Makefile.in 2008/01/12 11:26:16 1.40 @@ -1,5 +1,4 @@ -## $OpenXM: OpenXM/src/kxx/Makefile.in,v 1.24 2003/09/03 00:41:07 takayama Exp $ -# +## $OpenXM: OpenXM/src/kxx/Makefile.in,v 1.39 2006/10/08 23:49:18 takayama Exp $ # Depends on all-kan96xx [source tree of kan96xx at ${Kan96xx} is required] # install-gmp, install-gc, install-util # @@ -16,19 +15,30 @@ ## Nothing to do for now. ## If you change this file, do not forget to run autoconf and remove .configure_done ######### configurations. -OpenXM_HOME=../.. +#OpenXM_HOME=../.. +OpenXM_HOME=@prefix@ Kan96xx=../kan96xx -OpenXM_contrib=${OpenXM_HOME}/../OpenXM_contrib OpenXM_bin=${OpenXM_HOME}/bin OpenXM_lib=${OpenXM_HOME}/lib OpenXM_include=${OpenXM_HOME}/include OXWEAVE=${OpenXM_bin}/oxweave -KANLIB = ${Kan96xx}/Kan/kanlib.a ${OpenXM_lib}/libgmp.a ${OpenXM_lib}/libgc.a +KANLIB = ${Kan96xx}/Kan/kanlib.a -L${OpenXM_lib} -lgmp -lgc +# +OpenXM_HOME_for_debug=../.. +OpenXM_bin_for_debug=${OpenXM_HOME_for_debug}/bin +OpenXM_lib_for_debug=${OpenXM_HOME_for_debug}/lib +OpenXM_include_for_debug=${OpenXM_HOME_for_debug}/include ########## end of configurations CC=@CC@ RANLIB=@RANLIB@ LIBS=@LIBS@ CFLAGS = @CFLAGS@ -g -D_BSD_SOURCE +# University binary is no longer supported. See old configure.in (version 1.7) +#CFLAG2 = @CFLAG2@ +#CFLAG2p = @CFLAG2p@ +CFLAG2 = +CFLAG2p = +# Or use "lipo -create ox-i386 ox-ppc -output ox" #STATIC_LINK_FLAG=-static STATIC_LINK_FLAG= RM=rm @@ -36,14 +46,14 @@ RM=rm ### Set the server name in oxmain.c if you do not use the environmental ### variable LOAD_SM1_PATH. cf. $Kan96xx/lib/ox.sm1 -all : configure ox ox_sm1 oxlog ox100start +all : configure ox ox_sm1 oxlog ox100start ox_texmacs all2 : ox ox_sm1 testclient oxlog configure: Makefile Makefile: Makefile.in - ./configure + (rm -f .configure_done ; ./make-configure) # configure is added to repo for a while. configure-old : Makefile.in configure.in @@ -54,7 +64,7 @@ configure-old : Makefile.in configure.in # .error "Run ./make-configure" .c.o: - ${CC} ${CFLAGS} -I${OpenXM_include} -c $< + ${CC} ${CFLAGS} ${CFLAG2} -I${OpenXM_include} -c $< ox.a: ${Kan96xx}/plugin/ox.a /bin/rm -f ox.a ln -s ${Kan96xx}/plugin/ox.a ox.a @@ -63,11 +73,11 @@ ox_kan.h: ${Kan96xx}/plugin/ox_kan.h ln -s ${Kan96xx}/plugin/ox_kan.h ox_kan.h ox: oxmain.o ${Kan96xx}/plugin/mytcpio.o ${Kan96xx}/plugin/oxmisc.o file2.o - ${CC} ${STATIC_LINK_FLAG} ${CFLAGS} oxmain.o ${Kan96xx}/plugin/mytcpio.o ${Kan96xx}/plugin/oxmisc.o file2.o -o ox ${LIBS} + ${CC} ${STATIC_LINK_FLAG} ${CFLAGS} ${CFLAG2p} oxmain.o ${Kan96xx}/plugin/mytcpio.o ${Kan96xx}/plugin/oxmisc.o file2.o -o ox ${LIBS} oxmain.o: oxmain.c ox_kan.h serversm.h oxd: oxd.o xtag.o ${Kan96xx}/plugin/mytcpio.o ${Kan96xx}/plugin/oxmisc.o file2.o - ${CC} ${STATIC_LINK_FLAG} ${CFLAGS} oxd.o xtag.o ${Kan96xx}/plugin/mytcpio.o ${Kan96xx}/plugin/oxmisc.o file2.o -o oxd ${LIBS} + ${CC} ${STATIC_LINK_FLAG} ${CFLAGS} oxd.o xtag.o ${Kan96xx}/plugin/mytcpio.o ${Kan96xx}/plugin/oxmisc.o file2.o -o oxd ${LIBS} -L{OpenXM_lib} -lgc oxd.o: oxd.c ox_kan.h serversm.h xtag.o: xtag.c oxd-thread: oxd-thread.o xtag.o ${Kan96xx}/plugin/mytcpio.o ${Kan96xx}/plugin/oxmisc.o file2.o @@ -90,7 +100,7 @@ ox100start : ox100start.o ${OpenXM_lib}/libox_pathfin ox100start.o: ox100start.c file2.o: ${Kan96xx}/plugin/file2.c ${Kan96xx}/plugin/file2.h - ${CC} $(CFLAGS) -DKXX=1 -I${Kan96xx}/plugin -c ${Kan96xx}/plugin/file2.c + ${CC} $(CFLAGS) ${CFLAG2} -DKXX=1 -I${Kan96xx}/plugin -c ${Kan96xx}/plugin/file2.c nullstackmachine.o: nullstackmachine.c ox_kan.h sm1stackmachine.o: sm1stackmachine.c ox_kan.h @@ -108,36 +118,39 @@ testclient2 : testclient2.o ${Kan96xx}/Kan/kanlib.a ox ${CC} ${CFLAGS} -I${Kan96xx}/Kan testclient2.c -o testclient2 ${LIBS} ${KANLIB} testclient2.o: testclient.c ox_kan.h +ox_texmacs: ox_texmacs.o ${Kan96xx}/Kan/kanlib.a + ${CC} ${STATIC_LINK_FLAG} ${CFLAGS} ox_texmacs.o -o ox_texmacs ${LIBS} ${KANLIB} clean-done: -${RM} -f .configure_done clean: clean-done - -${RM} -f ox testclient ox_null ox_sm1 testclient2 core *.o a.out *.dvi *.aux openxxx.log ox_sm1 oxlog *~ openxm-eg.tex openxm-jp.tex ox100start + -${RM} -f ox testclient ox_null ox_sm1 testclient2 core *.o a.out *.dvi *.aux openxxx.log ox_sm1 oxlog *~ openxm-eg.tex openxm-jp.tex ox100start .prog.ox100bin* .in.ox100bin* ox_texmacs distclean : clean clean-for-install /bin/rm -f config.status config.cache config.log ## install targets. install-for-debug : clean-for-install install_lib_bin-for-debug - ${RM} -f ${OpenXM_bin}/ox ${OpenXM_bin}/ox_sm1 ${OpenXM_bin}/oxlog ${OpenXM_bin}/ox100start - ln -f -s ../src/kxx/ox ${OpenXM_bin}/ox - ln -f -s ../src/kxx/ox_sm1 ${OpenXM_bin}/ox_sm1 - ln -f -s ../src/kxx/oxlog ${OpenXM_bin}/oxlog - ln -f -s ../src/kxx/ox100start ${OpenXM_bin}/ox100start + ${RM} -f ${OpenXM_bin_for_debug}/ox ${OpenXM_bin_for_debug}/ox_sm1 ${OpenXM_bin_for_debug}/oxlog ${OpenXM_bin_for_debug}/ox100start ${OpenXM_bin_for_debug}/ox_texmacs + ln -f -s ../src/kxx/ox ${OpenXM_bin_for_debug}/ox + ln -f -s ../src/kxx/ox_sm1 ${OpenXM_bin_for_debug}/ox_sm1 + ln -f -s ../src/kxx/oxlog ${OpenXM_bin_for_debug}/oxlog + ln -f -s ../src/kxx/ox100start ${OpenXM_bin_for_debug}/ox100start + ln -f -s ../src/kxx/ox_texmacs ${OpenXM_bin_for_debug}/ox_texmacs install_lib_bin-for-debug : - ln -f -s ../src/kan96xx/Doc ${OpenXM_lib}/sm1 - ${RM} -f ${OpenXM_lib}/sm1/bin/ox* - ln -f -s ../../../../bin/ox ${OpenXM_lib}/sm1/bin/ox - ln -f -s ../../../../bin/oxlog ${OpenXM_lib}/sm1/bin/oxlog - ln -f -s ../../../../bin/ox_sm1 ${OpenXM_lib}/sm1/bin/ox_sm1 - ln -f -s ./ox_sm1 ${OpenXM_lib}/sm1/bin/ox_sm1_forAsir - ln -f -s ./ox_sm1 ${OpenXM_lib}/sm1/bin/ox_sm1_gnuplot - ln -f -s ./ox_sm1 ${OpenXM_lib}/sm1/bin/ox_sm1_phc - ln -f -s ./ox_sm1 ${OpenXM_lib}/sm1/bin/ox_sm1_tigers - ln -f -s ./ox_sm1 ${OpenXM_lib}/sm1/bin/ox_sm1_basicCD + ln -f -s ../src/kan96xx/Doc ${OpenXM_lib_for_debug}/sm1 + ${RM} -f ${OpenXM_lib_for_debug}/sm1/bin/ox* + ln -f -s ../../../../bin/ox ${OpenXM_lib_for_debug}/sm1/bin/ox + ln -f -s ../../../../bin/oxlog ${OpenXM_lib_for_debug}/sm1/bin/oxlog + ln -f -s ../../../../bin/ox_sm1 ${OpenXM_lib_for_debug}/sm1/bin/ox_sm1 + ln -f -s ./ox_sm1 ${OpenXM_lib_for_debug}/sm1/bin/ox_sm1_forAsir + ln -f -s ./ox_sm1 ${OpenXM_lib_for_debug}/sm1/bin/ox_sm1_gnuplot + ln -f -s ./ox_sm1 ${OpenXM_lib_for_debug}/sm1/bin/ox_sm1_phc + ln -f -s ./ox_sm1 ${OpenXM_lib_for_debug}/sm1/bin/ox_sm1_tigers + ln -f -s ./ox_sm1 ${OpenXM_lib_for_debug}/sm1/bin/ox_sm1_basicCD install: install-exec install-exec: copy-kan-lib install_lib_bin - install ox ox_sm1 oxlog ox100start ${OpenXM_bin} + install ox ox_sm1 oxlog ox100start ox_texmacs ${OpenXM_bin} install_lib_bin: if [ "`uname | sed -e 's/_.*$$//'`" = "CYGWIN" ]; then \ make install_lib_bin_windows ; \ @@ -188,6 +201,7 @@ copy-kan-lib : clean-for-install touch ${OpenXM_lib}/sm1/DO_NOT_EDIT_THIS_DIRECTORY._ALL_FILES_ARE_COPIED_FROM_kan96xx_Doc -if [ "`uname | sed -e 's/_.*$$//'`" = "CYGWIN" ]; then \ cp ${Kan96xx}/Doc/* ${OpenXM_lib}/sm1 ; \ + cp -r ${Kan96xx}/Doc/Resource ${OpenXM_lib}/sm1 ; \ mkdir ${OpenXM_lib}/sm1/bin ; \ else \ cp -r ${Kan96xx}/Doc/* ${OpenXM_lib}/sm1 ; \ @@ -197,7 +211,7 @@ copy-kan-lib : clean-for-install cp ${Kan96xx}/Kan/var.sm1 ${OpenXM_lib}/sm1 clean-for-install : -/bin/rm -rf ${OpenXM_lib}/sm1 - -/bin/rm -rf ${OpenXM_bin}/oxlog ${OpenXM_bin}/ox_sm1 ${OpenXM_bin}/ox ${OpenXM_bin}/ox100start + -/bin/rm -rf ${OpenXM_bin}/oxlog ${OpenXM_bin}/ox_sm1 ${OpenXM_bin}/ox ${OpenXM_bin}/ox100start ${OpenXM_bin}/ox_texmacs