patch-Makefile 2.0 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768
  1. $OpenBSD: patch-Makefile,v 1.5 2009/03/26 18:06:01 naddy Exp $
  2. --- Makefile.orig Wed Jan 14 17:23:41 2004
  3. +++ Makefile Thu Mar 26 19:02:54 2009
  4. @@ -3,8 +3,8 @@
  5. # Makefile for Unix and GNU/Linux with gcc/g++ compiler
  6. # Edit here:
  7. -CC=gcc
  8. -CPP=g++
  9. +#CC=gcc
  10. +CPP=${CXX}
  11. # Hints:
  12. # if you use egcs-2.90.* version of GCC please add option -fno-exceptions
  13. @@ -20,7 +20,7 @@ CPP=g++
  14. # Optimized version
  15. -CFLAGS = -c -Wall -O2 -g
  16. +CFLAGS += -c
  17. # -DSLIST removed because it wouldn't compile under gcc 3.x
  18. # add -DHASH_TABLE for extra speed (may sometimes produce inconsistent results)
  19. @@ -28,7 +28,8 @@ CFLAGS = -c -Wall -O2 -g
  20. #CFLAGS = -c -Wall -O2 -g -DSLIST -DNDEBUG
  21. # link zlib the compression/decompression library. used for decompressing jar files
  22. -LFLAGS=-g -lz
  23. +LFLAGS=-g
  24. +LIBS=-lz
  25. # Directory to place executables
  26. INSTALL_DIR=/usr/local/bin
  27. @@ -52,7 +53,7 @@ antic.o: antic.c
  28. $(CC) $(CFLAGS) antic.c
  29. antic: antic.o
  30. - $(CC) $(LFLAGS) -o antic antic.o
  31. + $(CC) $(LFLAGS) -o antic antic.o $(LIBS)
  32. clean:
  33. rm -f *.o *.exe core *~ *.his *.class jlint antic manual.{html,pdf,aux,cp,fn,ky,log,pg,toc,tp,vr} jlint_3.0.{aux,dvi,log,toc}
  34. @@ -103,10 +104,11 @@ test-zip:
  35. install:
  36. - cp jlint antic jlint.sh $(INSTALL_DIR)
  37. - chmod 755 $(INSTALL_DIR)/antic
  38. - chmod 755 $(INSTALL_DIR)/jlint
  39. - chmod 755 $(INSTALL_DIR)/jlint.sh
  40. + $(INSTALL_PROGRAM) antic $(PREFIX)/bin
  41. + $(INSTALL_PROGRAM) jlint $(PREFIX)/bin
  42. + $(INSTALL_PROGRAM) jlint.sh $(PREFIX)/bin
  43. + $(INSTALL_DATA_DIR) $(PREFIX)/share/doc/jlint
  44. + $(INSTALL_DATA) manual.pdf $(PREFIX)/share/doc/jlint
  45. # --> automatically generated dependencies follow; do not remove this line.
  46. @@ -120,7 +122,7 @@ jlint: \
  47. locks.o \
  48. message_node.o \
  49. method_desc.o
  50. - $(CPP) $(LFLAGS) -o jlint access_desc.o callee_desc.o class_desc.o graph.o jlint.o local_context.o locks.o message_node.o method_desc.o
  51. + $(CPP) $(LFLAGS) -o jlint access_desc.o callee_desc.o class_desc.o graph.o jlint.o local_context.o locks.o message_node.o method_desc.o $(LIBS)
  52. access_desc.o: access_desc.cc \
  53. access_desc.hh \