Update.

[universe.git] / Makefile

diff --git a/Makefile b/Makefile
index 23d8458..953f4ac 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -32,9 +32,9 @@ CXXFLAGS += -I/usr/include/cairo -DCAIRO_SUPPORT
 LDFLAGS += -lcairo
 
 TASK_SRC = dummy.cc move_square.cc hit_shape.cc
 LDFLAGS += -lcairo
 
 TASK_SRC = dummy.cc move_square.cc hit_shape.cc

-TASK_OBJ = $(TASK_SRC:.cc=.task)
+TASK_OBJ = $(TASK_SRC:.cc=.so)

 
 

-all: main TAGS $(TASK_OBJ)
+all: main generate TAGS $(TASK_OBJ)

 
 TAGS: *.cc *.h
        etags *.cc *.h
 
 TAGS: *.cc *.h
        etags *.cc *.h


@@ -42,8 +42,10 @@ TAGS: *.cc *.h
 main:  main.o misc.o \
        simple_window.o \
        universe.o \
 main:  main.o misc.o \
        simple_window.o \
        universe.o \

+       plotter.o \

        polygon.o \
        xfig_tracer.o \
        polygon.o \
        xfig_tracer.o \

+       canvas.o canvas_cairo.o \

        map.o \
        task.o \
        retina.o \
        map.o \
        task.o \
        retina.o \


@@ -52,13 +54,20 @@ main:       main.o misc.o \
        intelligence.o
        $(CXX) $(CXXFLAGS) $(LDFLAGS) -lX11 -o $@ $^
 
        intelligence.o
        $(CXX) $(CXXFLAGS) $(LDFLAGS) -lX11 -o $@ $^
 

-%.task: %.cc misc.o universe.o polygon.o xfig_tracer.o map.o task.o manipulator.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

        $(CXX) $(CXXFLAGS) -shared -Wl,-soname,$@ -o $@ $^
 
 Makefile.depend: *.h *.cc Makefile
        $(CXX) $(CXXFLAGS) -shared -Wl,-soname,$@ -o $@ $^
 
 Makefile.depend: *.h *.cc Makefile

-       $(CC) -M *.cc > Makefile.depend
+       $(CC) $(CXXFLAGS) -M *.cc > Makefile.depend

 
 clean:
 
 clean:

-       \rm -f main *.o *.task Makefile.depend
+       \rm -f main *.o *.so Makefile.depend

 
 -include Makefile.depend
 
 -include Makefile.depend