Revision f1158e5c

View differences:

EventScheduler/event_scheduler.c
56 56

  
57 57
void event_scheduler_destroy(struct event_scheduler **es)
58 58
{
59
	struct action_event ** ae_ptr;
59
//	struct action_event ** ae_ptr;
60 60

  
61 61
	if (es && (*es))
62 62
	{
Makefile
1 1
PEER_SCHED ?= ch_earliest_free_peer
2 2
CHUNK_SCHED ?= dl_sched
3 3

  
4
CFLAGS = -std=c99 -Wall
4
CFLAGS += -std=c99 -Wall
5 5
ifndef DBG
6 6
CFLAGS += -O8
7 7
endif
8 8
CFLAGS += -g -I EventScheduler/ -I Matrix/
9
LDLIBS = -lm 
9
LIBS += EventScheduler/libeventscheduler.a Matrix/libmatrix.a 
10
LDLIBS += -lm  
10 11

  
11 12
CPPFLAGS += -Dpeer_send=peer_send_c_p
12 13
CPPFLAGS += -Dpeer_sched=$(PEER_SCHED)
......
26 27

  
27 28
all: sssim proc-time
28 29

  
29
sssim: $(OBJS) EventScheduler/libeventscheduler.a Matrix/libmatrix.a
30
sssim: $(LIBS) $(OBJS) 
31
	$(CC) -o sssim $(CFLAGS) $(OBJS) $(LIBS) $(LDLIBS)
30 32

  
31 33
EventScheduler/libeventscheduler.a:
32 34
	$(MAKE) -C EventScheduler/
Test/Makefile
4 4
TARGET_OBJS=$(TARGET_SRC:.c=.o)
5 5
WRAPPERS=-Wl,-wrap,needs
6 6

  
7
LIBS=../Matrix/libmatrix.a -lm
8
CFLAGS=-g -O0 -I../ -I../Matrix/ 
7
LIBS=../Matrix/libmatrix.a -lm $(LDFLAGS) -L$(LD_LIBRARY_PATH)
8
CFLAGS+=-g -O0 -I../ -I../Matrix/ 
9 9

  
10 10
all: $(TARGET_SRC) $(TARGET_OBJS) $(OBJS)
11 11

  

Also available in: Unified diff