mirror of
https://github.com/openbsd/ports.git
synced 2026-06-18 15:33:55 +02:00
robert
149 lines
3.9 KiB
Plaintext
149 lines
3.9 KiB
Plaintext
Index: Makefile
|
|
--- Makefile.orig
|
|
+++ Makefile
|
|
@@ -3,8 +3,8 @@
|
|
# Makefile for Unix and GNU/Linux with gcc/g++ compiler
|
|
# Edit here:
|
|
|
|
-CC=gcc
|
|
-CPP=g++
|
|
+#CC=gcc
|
|
+CPP=${CXX}
|
|
|
|
# Hints:
|
|
# if you use egcs-2.90.* version of GCC please add option -fno-exceptions
|
|
@@ -20,7 +20,8 @@ CPP=g++
|
|
|
|
# Optimized version
|
|
|
|
-CFLAGS = -c -Wall -O2 -g
|
|
+CFLAGS += -c
|
|
+CXXFLAGS += -c
|
|
# -DSLIST removed because it wouldn't compile under gcc 3.x
|
|
# add -DHASH_TABLE for extra speed (may sometimes produce inconsistent results)
|
|
|
|
@@ -28,7 +29,8 @@ CFLAGS = -c -Wall -O2 -g
|
|
#CFLAGS = -c -Wall -O2 -g -DSLIST -DNDEBUG
|
|
|
|
# link zlib the compression/decompression library. used for decompressing jar files
|
|
-LFLAGS=-g -lz
|
|
+LFLAGS=-g
|
|
+LIBS=-lz
|
|
|
|
# Directory to place executables
|
|
INSTALL_DIR=/usr/local/bin
|
|
@@ -52,7 +54,7 @@ antic.o: antic.c
|
|
$(CC) $(CFLAGS) antic.c
|
|
|
|
antic: antic.o
|
|
- $(CC) $(LFLAGS) -o antic antic.o
|
|
+ $(CC) $(LFLAGS) -o antic antic.o $(LIBS)
|
|
|
|
clean:
|
|
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}
|
|
@@ -103,10 +105,11 @@ test-zip:
|
|
|
|
|
|
install:
|
|
- cp jlint antic jlint.sh $(INSTALL_DIR)
|
|
- chmod 755 $(INSTALL_DIR)/antic
|
|
- chmod 755 $(INSTALL_DIR)/jlint
|
|
- chmod 755 $(INSTALL_DIR)/jlint.sh
|
|
+ $(INSTALL_PROGRAM) antic $(PREFIX)/bin
|
|
+ $(INSTALL_PROGRAM) jlint $(PREFIX)/bin
|
|
+ $(INSTALL_PROGRAM) jlint.sh $(PREFIX)/bin
|
|
+ $(INSTALL_DATA_DIR) $(PREFIX)/share/doc/jlint
|
|
+ $(INSTALL_DATA) manual.pdf $(PREFIX)/share/doc/jlint
|
|
|
|
|
|
# --> automatically generated dependencies follow; do not remove this line.
|
|
@@ -120,7 +123,7 @@ jlint: \
|
|
locks.o \
|
|
message_node.o \
|
|
method_desc.o
|
|
- $(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
|
|
+ $(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)
|
|
|
|
access_desc.o: access_desc.cc \
|
|
access_desc.hh \
|
|
@@ -143,7 +146,7 @@ access_desc.o: access_desc.cc \
|
|
callee_desc.hh \
|
|
local_context.hh \
|
|
string_pool.hh
|
|
- $(CPP) $(CFLAGS) access_desc.cc
|
|
+ $(CPP) $(CXXFLAGS) access_desc.cc
|
|
|
|
callee_desc.o: callee_desc.cc \
|
|
callee_desc.hh \
|
|
@@ -166,7 +169,7 @@ callee_desc.o: callee_desc.cc \
|
|
local_context.hh \
|
|
access_desc.hh \
|
|
string_pool.hh
|
|
- $(CPP) $(CFLAGS) callee_desc.cc
|
|
+ $(CPP) $(CXXFLAGS) callee_desc.cc
|
|
|
|
class_desc.o: class_desc.cc \
|
|
class_desc.hh \
|
|
@@ -189,7 +192,7 @@ class_desc.o: class_desc.cc \
|
|
local_context.hh \
|
|
access_desc.hh \
|
|
string_pool.hh
|
|
- $(CPP) $(CFLAGS) class_desc.cc
|
|
+ $(CPP) $(CXXFLAGS) class_desc.cc
|
|
|
|
graph.o: graph.cc \
|
|
graph.hh \
|
|
@@ -212,7 +215,7 @@ graph.o: graph.cc \
|
|
utf_string.hh \
|
|
message_node.hh \
|
|
overridden_method.hh
|
|
- $(CPP) $(CFLAGS) graph.cc
|
|
+ $(CPP) $(CXXFLAGS) graph.cc
|
|
|
|
jlint.o: jlint.cc \
|
|
jlint.hh \
|
|
@@ -236,7 +239,7 @@ jlint.o: jlint.cc \
|
|
functions.hh \
|
|
inlines.hh \
|
|
locks.hh
|
|
- $(CPP) $(CFLAGS) jlint.cc
|
|
+ $(CPP) $(CXXFLAGS) jlint.cc
|
|
|
|
local_context.o: local_context.cc \
|
|
local_context.hh \
|
|
@@ -259,7 +262,7 @@ local_context.o: local_context.cc \
|
|
locks.hh \
|
|
graph.hh \
|
|
overridden_method.hh
|
|
- $(CPP) $(CFLAGS) local_context.cc
|
|
+ $(CPP) $(CXXFLAGS) local_context.cc
|
|
|
|
locks.o: locks.cc \
|
|
locks.hh \
|
|
@@ -271,7 +274,7 @@ locks.o: locks.cc \
|
|
utf_string.hh \
|
|
functions.hh \
|
|
message_node.hh
|
|
- $(CPP) $(CFLAGS) locks.cc
|
|
+ $(CPP) $(CXXFLAGS) locks.cc
|
|
|
|
message_node.o: message_node.cc \
|
|
message_node.hh \
|
|
@@ -279,7 +282,7 @@ message_node.o: message_node.cc \
|
|
types.hh \
|
|
jlint.d \
|
|
jlint.msg
|
|
- $(CPP) $(CFLAGS) message_node.cc
|
|
+ $(CPP) $(CXXFLAGS) message_node.cc
|
|
|
|
method_desc.o: method_desc.cc \
|
|
method_desc.hh \
|
|
@@ -302,6 +305,6 @@ method_desc.o: method_desc.cc \
|
|
message_node.hh \
|
|
graph.hh \
|
|
overridden_method.hh
|
|
- $(CPP) $(CFLAGS) method_desc.cc
|
|
+ $(CPP) $(CXXFLAGS) method_desc.cc
|
|
|
|
# --> end of automatically generated dependencies; do not remove this line.
|