]>
Commit | Line | Data |
---|---|---|
8c8dd2b7 TO |
1 | --- cheops-ng-0.1.11/Makefile.in Fri May 23 15:08:50 2003 |
2 | +++ tmp/Makefile.in Fri May 23 15:08:41 2003 | |
3 | @@ -4,7 +4,7 @@ | |
4 | # Debugging | |
5 | DEBUG_FLAGS=# -DDEBUG_DISCOVER -DDEBUG_EVENT -DDEBUG_IO -DDEBUG_SCHEDULER | |
6 | ||
7 | -CFLAGS = @CFLAGS@ -Iadns-1.0/src | |
8 | +CFLAGS = @CFLAGS@ | |
9 | LIBS = @LIBS@ | |
10 | ||
11 | CC=@CC@ | |
12 | @@ -48,9 +48,8 @@ | |
13 | AGENTOBJS = cheops-agent.o agent-discover.o agent-settings.o \ | |
14 | agent-event.o agent-io.o agent-ip_utils.o agent-osscan.o \ | |
15 | agent-map.o probe.o agent-probe.o agent-auth.o agent-nmapxml.o | |
16 | - | |
17 | -AGENTLIBS = ./adns-1.0/src/libadns.a | |
18 | -AGENTLIBFLAGS = -lm $(LIBS) -L./adns-1.0/src/ -lcrypt | |
19 | + | |
20 | +AGENTLIBFLAGS = -lm $(LIBS) -lcrypt -ladns | |
21 | ||
22 | # Objects for Cheops Agent Shell | |
23 | SHOBJS = event.o io.o cheops-sh.o cheops-sh-guts.o ip_utils.o | |
24 | @@ -73,7 +72,7 @@ | |
25 | TESTS = test-sched test-socket test-probe | |
26 | COMLIBS = #@COMLIBS@ | |
27 | CC_LIBS = | |
28 | -CFLAGS += -Wall -g -Iadns-1.0/src $(DEBUG_FLAGS) $(GTKCFLAGS) $(XMLCFLAGS) | |
29 | +CFLAGS += -Wall -g $(DEBUG_FLAGS) $(GTKCFLAGS) $(XMLCFLAGS) | |
30 | ||
31 | ifdef DEBUG | |
32 | CFLAGS += -DDEBUG_DISCOVER -DDEBUG_MAP -DDEBUG_NMAPXML -DDEBUG_OS_SCAN -DDEBUG_AGENT_PROBE -DDEBUG_CHEOPS_GUI -DDEBUG_EVENT -DDEBUG_CANVAS -DDEBUG_CONFIG -DDEBUG_GUI_HANDLERS -DDEBUG_IO -DDEBUG_PROBE | |
33 | @@ -83,7 +82,7 @@ | |
34 | # Additional programs | |
35 | #PROGS = test-sched test-io cheops-sh | |
36 | ||
37 | -all: version.h installdir.h ./adns-1.0/src/libadns.a $(PROGS) | |
38 | +all: version.h installdir.h $(PROGS) | |
39 | ||
40 | static: version.h $(COMOBJS) $(GUIOBJS) $(GTKOBJS) $(COMLIBS) $(AGENTOBJS) $(AGENTLIBS) $(COMOBJS) $(NORMOBJS) $(COMLIBS) | |
41 | rm cheops-ng cheops-agent -f | |
42 | @@ -109,17 +108,11 @@ | |
43 | echo "#define CHEOPS_VERSION \"`cat version`\"" >> version.h | |
44 | echo "#endif" >> version.h | |
45 | ||
46 | -./adns-1.0/src/Makefile: ./adns-1.0/src/Makefile.in | |
47 | - cd adns-1.0; ./configure | |
48 | - | |
49 | -./adns-1.0/src/libadns.a: ./adns-1.0/src/Makefile | |
50 | - $(MAKE) -C ./adns-1.0/src/ | |
51 | - | |
52 | cheops-ng: version.h $(COMOBJS) $(GUIOBJS) $(GTKOBJS) $(COMLIBS) | |
53 | - $(CC) -o cheops-ng $(COMOBJS) $(GUIOBJS) $(GTKOBJS) $(COMLIBS) $(GTKLIBS) $(CC_LIBS) ./adns-1.0/src/libadns.a $(STATIC_FLAGS) | |
54 | + $(CC) -o cheops-ng $(COMOBJS) $(GUIOBJS) $(GTKOBJS) $(COMLIBS) $(GTKLIBS) $(CC_LIBS) $(STATIC_FLAGS) | |
55 | ||
56 | -cheops-agent: version.h $(AGENTOBJS) $(AGENTLIBS) $(COMOBJS) $(NORMOBJS) $(COMLIBS) | |
57 | - $(CC) -o cheops-agent $(COMOBJS) $(AGENTOBJS) $(COMLIBS) $(AGENTLIBS) $(NORMOBJS) $(CC_LIBS) $(AGENTLIBFLAGS) $(GLIB) $(STATIC_FLAGS) | |
58 | +cheops-agent: version.h $(AGENTOBJS) $(COMOBJS) $(NORMOBJS) $(COMLIBS) | |
59 | + $(CC) -o cheops-agent $(COMOBJS) $(AGENTOBJS) $(COMLIBS) $(NORMOBJS) $(CC_LIBS) $(AGENTLIBFLAGS) $(GLIB) $(STATIC_FLAGS) | |
60 | ||
61 | cheops-sh: $(COMOBJS) $(SHOBJS) $(NORMOBJS) $(COMLIBS) | |
62 | $(CC) -o cheops-sh $(COMOBJS) $(SHOBJS) $(COMLIBS) $(SHLIBS) $(NORMOBJS) $(CC_LIBS) $(SHLIBFLAGS) |