hdiff output

r27724/config.h 2017-01-21 10:40:45.973415819 +0000 r27723/config.h 2017-01-21 10:40:46.705451313 +0000
 35: #          LEX=flex below.  For example, on many linux distributions, 35: #          LEX=flex below.  For example, on many linux distributions,
 36: #          /usr/bin/lex is really just a pointer to /usr/bin/flex, 36: #          /usr/bin/lex is really just a pointer to /usr/bin/flex,
 37: #          so LEX=flex is necessary.  In general, gcc seems to need 37: #          so LEX=flex is necessary.  In general, gcc seems to need
 38: #          flex. 38: #          flex.
 39:  39: 
 40: CC=gcc   40: CC=gcc  
 41: ##CFLAGS=-march=pentium4  41: ##CFLAGS=-march=pentium4 
 42: #CFLAGS=-O3 -Mnoframe -Mflushz -Munroll 42: #CFLAGS=-O3 -Mnoframe -Mflushz -Munroll
 43: #OCFLAGS=-O3 -Mnoframe -Mflushz -Munroll 43: #OCFLAGS=-O3 -Mnoframe -Mflushz -Munroll
 44: CFLAGS=-O0 -g  44: CFLAGS=-O0 -g 
 45: OCFLAGS=-fPIC 
 46: ##-Mprefetch=w -tp=amd64e   45: ##-Mprefetch=w -tp=amd64e  
 47: ##CFLAGS=-O3 -Mprefetch=w -tp=amd64e 46: ##CFLAGS=-O3 -Mprefetch=w -tp=amd64e
 48: #NABFLAGS= 47: #NABFLAGS=
 49: ##CFLAGS= -march=pentium4  48: ##CFLAGS= -march=pentium4 
 50: ##OCFLAGS=-O3 -march=pentium4   49: ##OCFLAGS=-O3 -march=pentium4  
 51: ##NABFLAGS= 50: ##NABFLAGS=
 52: CFLAGS = $(EXTRA_CFLAGS)  51: CFLAGS = $(EXTRA_CFLAGS) 
 53:  52: 
 54: LEX=    flex 53: LEX=    flex
 55: #YACC=bison -y -t 54: #YACC=bison -y -t


r27724/Makefile 2017-01-21 10:40:46.197426680 +0000 r27723/Makefile 2017-01-21 10:40:46.941462751 +0000
  1: include ../config.h  1: include ../config.h
  2: .SUFFIXES:  2: .SUFFIXES:
  3: .SUFFIXES:  .nab .c .o .f  3: .SUFFIXES:  .nab .c .o .f
  4:   4: 
  5: .nab.o:  5: .nab.o:
  6:         ./nab  -c $(NABFLAGS) $<  6:         ./nab  -c $(NABFLAGS) $<
  7:         @rm -f $*.c  7:         @rm -f $*.c
  8:   8: 
  9: .c.o: $<  9: .c.o: $<
 10:         $(CC) -c -fPIC $(CFLAGS) $< 10:         $(CC) -c $(CFLAGS) $<
 11:  11: 
 12: .f.o: $< 12: .f.o: $<
 13:         $(FC)  $-c $(FFLAGS) -Mfree  $(FREEFORMAT_FLAG)< 13:         $(FC)  $-c $(FFLAGS) -Mfree  $(FREEFORMAT_FLAG)<
 14:  14: 
 15: NAB2COBJS=        \ 15: NAB2COBJS=        \
 16:         nab2c.o        \ 16:         nab2c.o        \
 17:         cgen.o        \ 17:         cgen.o        \
 18:         checkexpr.o        \ 18:         checkexpr.o        \
 19:         dumpnode.o\ 19:         dumpnode.o\
 20:         errormsg.o        \ 20:         errormsg.o        \
 87: EXAMPLES=        \ 87: EXAMPLES=        \
 88:         ../examples/program_*.nab 88:         ../examples/program_*.nab
 89:  89: 
 90: #=========================================================================== 90: #===========================================================================
 91:  91: 
 92: system:        nab        \ 92: system:        nab        \
 93:         nab2c        \ 93:         nab2c        \
 94:         libnab.a 94:         libnab.a
 95:  95: 
 96: nab: nab.c 96: nab: nab.c
 97:         $(CC) -DBINDIR='"."' -DINCDIR='"."' -DLIBDIR='"."' $(CFLAGS) \ 97:         $(CC) -DBINDIR='"."' -DINCDIR='"."' -DLIBDIR='"."'  $(CFLAGS) \
 98:                 -DCC='"$(CC)"' -DCPP='"$(CPP)"' -DFLIBS='"$(FLIBS)"' -o nab$(SFX) nab.c 98:                 -DCC='"$(CC)"' -DCPP='"$(CPP)"' -DFLIBS='"$(FLIBS)"' -o nab$(SFX) nab.c
 99:  99: 
100: nab2c:        $(NAB2COBJS)100: nab2c:        $(NAB2COBJS)
101:         $(CC) $(CFLAGS) -o nab2c$(SFX) $(NAB2COBJS)101:         $(CC) $(CFLAGS) -o nab2c$(SFX) $(NAB2COBJS)
102: 102: 
103: libnab.a: $(LIBNABOBJS) 103: libnab.a: $(LIBNABOBJS) 
104:         -rm -f libnab.a104:         -rm -f libnab.a
105:         $(AR) rv libnab.a $(LIBNABOBJS)105:         $(AR) rv libnab.a $(LIBNABOBJS)
106:         -ranlib libnab.a106:         -ranlib libnab.a
107: 107: 


r27724/PythonGMIN.cmake 2017-01-21 10:40:45.729403942 +0000 r27723/PythonGMIN.cmake 2017-01-21 10:40:46.481440457 +0000
 38:       add_library(dmagmin_ SHARED pygmin.F python/pydmagmin.cpp python/dmagmin_wrapper.f90 ${DUMMY_CHARMM} ${DUMMY_AMBER9} ${DUMMY_AMH} ${DUMMY_USERPOT} ${DUMMY_TESTING}) 38:       add_library(dmagmin_ SHARED pygmin.F python/pydmagmin.cpp python/dmagmin_wrapper.f90 ${DUMMY_CHARMM} ${DUMMY_AMBER9} ${DUMMY_AMH} ${DUMMY_USERPOT} ${DUMMY_TESTING})
 39:       target_link_libraries(dmagmin_ gminlib dmacrysinterface gminlib ${MYLAPACK_LIBS} ${Boost_PYTHON_LIBRARY}) 39:       target_link_libraries(dmagmin_ gminlib dmacrysinterface gminlib ${MYLAPACK_LIBS} ${Boost_PYTHON_LIBRARY})
 40:       set_target_properties(dmagmin_ PROPERTIES PREFIX "") 40:       set_target_properties(dmagmin_ PROPERTIES PREFIX "")
 41:       #set_target_properties($(PY_MODULE} PROPERTIES LINKER_LANGUAGE CXX) 41:       #set_target_properties($(PY_MODULE} PROPERTIES LINKER_LANGUAGE CXX)
 42:       install_targets(/share/gmin/python dmagmin_) 42:       install_targets(/share/gmin/python dmagmin_)
 43:       set_target_properties(dmagmin_ PROPERTIES COMPILE_FLAGS "-DGMIN_PYTHON_MODULE=2") 43:       set_target_properties(dmagmin_ PROPERTIES COMPILE_FLAGS "-DGMIN_PYTHON_MODULE=2")
 44:     endif(WITH_DMACRYS) 44:     endif(WITH_DMACRYS)
 45:  45: 
 46:     if(WITH_AMBER9) 46:     if(WITH_AMBER9)
 47:       add_library(ambgmin_ SHARED pygmin.F python/pygmin.cpp python/wrapper.f90 ${DUMMY_CHARMM} ${DUMMY_AMH} ${DUMMY_DMACRYS} ${DUMMY_USERPOT} ${DUMMY_TESTING}) 47:       add_library(ambgmin_ SHARED pygmin.F python/pygmin.cpp python/wrapper.f90 ${DUMMY_CHARMM} ${DUMMY_AMH} ${DUMMY_DMACRYS} ${DUMMY_USERPOT} ${DUMMY_TESTING})
 48:       target_link_libraries(ambgmin_ gminlib AMBER_LIB NAB_LIB dummylib ${MYLAPACK_LIBS} ${Boost_PYTHON_LIBRARY}) 48:       target_link_libraries(ambgmin_ gminlib amber nab dummylib ${MYLAPACK_LIBS} ${Boost_PYTHON_LIBRARY})
 49:       set_target_properties(ambgmin_ PROPERTIES PREFIX "") 49:       set_target_properties(ambgmin_ PROPERTIES PREFIX "")
 50:       #set_target_properties($(PY_MODULE} PROPERTIES LINKER_LANGUAGE CXX) 50:       #set_target_properties($(PY_MODULE} PROPERTIES LINKER_LANGUAGE CXX)
 51:       install_targets(/share/gmin/python ambgmin_) 51:       install_targets(/share/gmin/python ambgmin_)
 52:       set_target_properties(ambgmin_ PROPERTIES COMPILE_FLAGS "-DGMIN_PYTHON_MODULE=3") 52:       set_target_properties(ambgmin_ PROPERTIES COMPILE_FLAGS "-DGMIN_PYTHON_MODULE=3")
 53:     endif(WITH_AMBER9) 53:     endif(WITH_AMBER9)
 54:  54: 
 55:     if(WITH_OXDNA) 55:     if(WITH_OXDNA)
 56:       add_library(oxdnagmin_ SHARED pygmin.F python/pygmin.cpp python/wrapper.f90 ${DUMMY_CHARMM} ${DUMMY_AMBER9} ${DUMMY_AMH} ${DUMMY_DMACRYS} ${DUMMY_TESTING}) 56:       add_library(oxdnagmin_ SHARED pygmin.F python/pygmin.cpp python/wrapper.f90 ${DUMMY_CHARMM} ${DUMMY_AMBER9} ${DUMMY_AMH} ${DUMMY_DMACRYS} ${DUMMY_TESTING})
 57:       target_link_libraries(oxdnagmin_ gminlib OXDNA ${MYLAPACK_LIBS} ${Boost_PYTHON_LIBRARY}) 57:       target_link_libraries(oxdnagmin_ gminlib OXDNA ${MYLAPACK_LIBS} ${Boost_PYTHON_LIBRARY})
 58:       set_target_properties(oxdnagmin_ PROPERTIES PREFIX "") 58:       set_target_properties(oxdnagmin_ PROPERTIES PREFIX "")


legend
Lines Added 
Lines changed
 Lines Removed

hdiff - version: 2.1.0