You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
gentoo-overlay/sci-chemistry/cns/files/1.2.1-gentoo.patch

64 lines
2.0 KiB

--- cns_solve_1.21/instlib/source/Makefile.proto 2000-09-07 20:35:33.000000000 +0200
+++ cns_solve_1.21/instlib/source/Makefile.proto.new 2009-07-14 09:18:37.000000000 +0200
@@ -11,6 +11,8 @@
SHELL=/bin/sh
+cns_string=`date "+%y%m%d%H%M"`
+
# commands
RM = /bin/rm
@@ -25,26 +27,20 @@
# rule for the fortran routines
$(OBJS):
- @ echo "compiling: $(@:.o=.f)"; \
- $(F77) -c $(F77FLAGS) $(@:.o=.f)
+ $(F77) -c $(F77FLAGS) $(@:.o=.f)
# rule for the dynamic memory allocation C routines
dmemory.o: dmemory.c
- @ echo ; echo "compiling: $?"
- @ $(CC) -c $(CCFLAGS) $?
+ $(CC) -c $(CCFLAGS) $?
# rule for the machine specific C routines
machine_c.o: machine_c.c
- @ echo ; echo "compiling: $?"
- @ $(CC) -c $(CCFLAGS) $?
+ $(CC) -c $(CCFLAGS) $?
# rule for the executable itself
../bin/cns_solve: $(DEPENDS)
- @ echo ; echo "linking: cns_solve"; echo
- @ cns_string=`date "+%y%m%d%H%M"`; \
- $(LD) -o cns_solve-$$cns_string.exe $(OBJS) dmemory.o machine_c.o \
- $(LDFLAGS) \
- $(CNS_FFTDIR) $(CNS_FFTLIB); \
+ $(LD) $(LDFLAGS) -o cns_solve-$$cns_string.exe $(OBJS) dmemory.o machine_c.o \
+ $(CNS_FFTDIR) $(CNS_FFTLIB); \
if [ -x cns_solve-$$cns_string.exe ]; \
then echo "created executable file cns_solve-$$cns_string.exe"; \
echo ""; cd ../bin; $(RM) -f cns_solve; $(RM) -f cns; \
--- cns_solve_1.21/instlib/utils/Makefile 2004-08-30 00:40:35.000000000 +0200
+++ cns_solve_1.21/instlib/utils/Makefile.new 2009-07-14 09:50:27.000000000 +0200
@@ -22,14 +22,14 @@
make clean
.f:
- $(F77) -o $@ $(F77FLAGS) $(@).f $(F77LINK)
+ $(F77) $(LDFLAGS) -o $@ $(F77FLAGS) $(@).f $(F77LINK)
.c:
- $(CC) -o $@ $(CCFLAGS) $(@).c $(CCLINK)
+ $(CC) $(LDFLAGS) -o $@ $(CCFLAGS) $(@).c $(CCLINK)
.l:
lex $(@).l
- $(CC) $(CCFLAGS) -o $@ lex.yy.c $(CCLINK) -l$(LEXLIB)
+ $(CC) $(LDFLAGS) $(CCFLAGS) -o $@ lex.yy.c $(CCLINK) -l$(LEXLIB)
relink:
@ cd $(CNS_INST)/utils; touch x; rm -f x `ls * | grep -v Makefile`