3.0.2-as-needed.patch 1.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051
  1. diff --git a/Makefile b/Makefile
  2. index 1a1c549..4d74dd0 100644
  3. --- a/Makefile
  4. +++ b/Makefile
  5. @@ -58,7 +58,7 @@ linux:
  6. @echo OSDEFS = -DLINUX -DNETWORKBYTEORDER >> Makefile.incl
  7. @echo include Makefile.package >> Makefile.incl
  8. @echo >> Makefile.incl
  9. - @echo qinp.o: qinp.f >> Makefile.incl
  10. + @echo qinp.o: qinp.f normal3d.o render.o >> Makefile.incl
  11. @echo " \$$(FC) -g -O0 -Wall -Wtabs -c -o qinp.o qinp.f" >> Makefile.incl
  12. @echo >> Makefile.incl
  13. @@ -214,20 +214,20 @@ ribbon: ribbon.f ribbon1.f modsubs.f
  14. ribbon.f ribbon1.f modsubs.f -o ribbon
  15. rastep: rastep.f quadric.o suv.o
  16. - $(FC) $(FFLAGS) \
  17. - rastep.f quadric.o suv.o $(LDFLAGS) \
  18. + $(FC) $(FFLAGS) $(LDFLAGS) \
  19. + rastep.f quadric.o suv.o \
  20. -o rastep
  21. render: render.o local.o quadric.o parse.o r3dtogd.o ungz.o qinp.o
  22. - $(FC) $(FFLAGS) \
  23. + $(FC) $(FFLAGS) $(LDFLAGS) \
  24. render.o local.o quadric.o parse.o r3dtogd.o ungz.o \
  25. qinp.o \
  26. - $(LIBS) $(LDFLAGS) \
  27. - -o render
  28. + -o render \
  29. + $(LIBS)
  30. normal3d: normal3d.o quadric.o qinp.o ungz.o parameters.incl
  31. - $(FC) $(FFLAGS) \
  32. - normal3d.o quadric.o ungz.o qinp.o $(LDFLAGS) \
  33. + $(FC) $(FFLAGS) $(LDFLAGS) \
  34. + normal3d.o quadric.o ungz.o qinp.o \
  35. -o normal3d
  36. stereo3d:
  37. @@ -264,7 +264,7 @@ example1.png: render_small
  38. ./render_small
  39. render_small: render_small.o local.o quadric.o parse_small.o r3dtogd.o ungz.o qinp_small.o
  40. - $(FC) $(FFLAGS) $^ $(LIBS) $(LDFLAGS) -o $@
  41. + $(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
  42. .SUFFIXES: .incl
  43. SMALL=10