=================================================================== RCS file: /home/cvs/OpenXM/src/kxx/Makefile.in,v retrieving revision 1.30 retrieving revision 1.44 diff -u -p -r1.30 -r1.44 --- OpenXM/src/kxx/Makefile.in 2004/06/23 22:49:17 1.30 +++ OpenXM/src/kxx/Makefile.in 2016/03/31 05:27:34 1.44 @@ -1,5 +1,4 @@ -## $OpenXM: OpenXM/src/kxx/Makefile.in,v 1.29 2004/03/01 09:48:45 takayama Exp $ -# +## $OpenXM: OpenXM/src/kxx/Makefile.in,v 1.43 2016/03/30 08:25:44 takayama Exp $ # Depends on all-kan96xx [source tree of kan96xx at ${Kan96xx} is required] # install-gmp, install-gc, install-util # @@ -16,18 +15,27 @@ ## 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_bin=${OpenXM_HOME}/bin OpenXM_lib=${OpenXM_HOME}/lib OpenXM_include=${OpenXM_HOME}/include OXWEAVE=${OpenXM_bin}/oxweave 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 +MYSIG=${OpenXM_lib}/mysig.o ########## end of configurations CC=@CC@ RANLIB=@RANLIB@ LIBS=@LIBS@ -CFLAGS = @CFLAGS@ -g -D_BSD_SOURCE +CFLAGS = @CFLAGS@ -g -D_BSD_SOURCE -I${OpenXM_include} +# University binary is no longer supported. See old configure.in (version 1.7) +# Or use "lipo -create ox-i386 ox-ppc -output ox" #STATIC_LINK_FLAG=-static STATIC_LINK_FLAG= RM=rm @@ -42,7 +50,7 @@ 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 @@ -52,8 +60,6 @@ configure-old : Makefile.in configure.in # autoconf # .error "Run ./make-configure" -.c.o: - ${CC} ${CFLAGS} -I${OpenXM_include} -c $< ox.a: ${Kan96xx}/plugin/ox.a /bin/rm -f ox.a ln -s ${Kan96xx}/plugin/ox.a ox.a @@ -61,12 +67,12 @@ ox_kan.h: ${Kan96xx}/plugin/ox_kan.h /bin/rm -f 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} +ox: oxmain.o ${Kan96xx}/plugin/mytcpio.o ${Kan96xx}/plugin/oxmisc.o ${MYSIG} file2.o + ${CC} ${STATIC_LINK_FLAG} ${CFLAGS} oxmain.o ${Kan96xx}/plugin/mytcpio.o ${Kan96xx}/plugin/oxmisc.o ${MYSIG} 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 @@ -84,8 +90,8 @@ oxlog: oxlog.o ${CC} ${STATIC_LINK_FLAG} -o oxlog oxlog.o oxlog.o: oxlog.c -ox100start : ox100start.o ${OpenXM_lib}/libox_pathfinder.a - ${CC} -I${OpenXM_include} ${STATIC_LINK_FLAG} -o ox100start ox100start.c -L${OpenXM_lib} -lox_pathfinder +ox100start : ox100start.o ${OpenXM_lib}/libox_pathfinder.a ${MYSIG} + ${CC} -I${OpenXM_include} ${STATIC_LINK_FLAG} -o ox100start ox100start.c ${MYSIG} -L${OpenXM_lib} -lox_pathfinder ox100start.o: ox100start.c file2.o: ${Kan96xx}/plugin/file2.c ${Kan96xx}/plugin/file2.h @@ -119,30 +125,32 @@ distclean : clean clean-for-install ## 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 ${OpenXM_bin}/ox_texmacs - 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 - ln -f -s ../src/kxx/ox_texmacs ${OpenXM_bin}/ox_texmacs + ${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 ox_texmacs ${OpenXM_bin} install_lib_bin: if [ "`uname | sed -e 's/_.*$$//'`" = "CYGWIN" ]; then \ make install_lib_bin_windows ; \ + elif [ "`uname | sed -e 's/_.*$$//'`" = "MSYS" ]; then \ + make install_lib_bin_windows ; \ else \ make install_lib_bin_unix ; \ fi @@ -190,6 +198,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 ; \