Update.

[universe.git] / Makefile

diff --git a/Makefile b/Makefile
index 953f4ac..29953d6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ LDFLAGS = -lz -ldl
 
 # Do we use X11?
 CXXFLAGS += -DX11_SUPPORT
-LDFLAGS += -L/usr/X11R6/lib/
+LDFLAGS += -L/usr/lib/x86_64-linux-gnu/
 
 # Do we use cairo?
 CXXFLAGS += -I/usr/include/cairo -DCAIRO_SUPPORT
@@ -34,7 +34,7 @@ LDFLAGS += -lcairo
 TASK_SRC = dummy.cc move_square.cc hit_shape.cc
 TASK_OBJ = $(TASK_SRC:.cc=.so)
 
-all: main generate TAGS $(TASK_OBJ)
+all: main TAGS $(TASK_OBJ)
 
 TAGS: *.cc *.h
        etags *.cc *.h
@@ -44,24 +44,15 @@ main:       main.o misc.o \
        universe.o \
        plotter.o \
        polygon.o \
-       xfig_tracer.o \
        canvas.o canvas_cairo.o \
        map.o \
        task.o \
-       retina.o \
        manipulator.o \
        approximer.o \
        intelligence.o
-       $(CXX) $(CXXFLAGS) $(LDFLAGS) -lX11 -o $@ $^
+       $(CXX) $(CXXFLAGS) $^ $(LDFLAGS) -lX11 -o $@
 
-generate:      generate.o misc.o \
-       universe.o \
-       plotter.o \
-       polygon.o \
-       canvas.o canvas_cairo.o
-       $(CXX) $(CXXFLAGS) $(LDFLAGS) -lX11 -o $@ $^
-
-%.so: %.cc misc.o universe.o polygon.o xfig_tracer.o map.o task.o manipulator.o
+%.so: %.cc misc.o universe.o polygon.o map.o task.o manipulator.o
        $(CXX) $(CXXFLAGS) -shared -Wl,-soname,$@ -o $@ $^
 
 Makefile.depend: *.h *.cc Makefile