Work on mods.

FossilOrigin-Name: 854e21683acac6a13ce938ea49c55bc0ced53c40af9053e904d0c6dbfe16dd79
This commit is contained in:
7u83@mail.ru
2016-02-26 22:33:30 +00:00
parent f3e471174d
commit a7dbeb049a
8 changed files with 50 additions and 38 deletions

View File

@ -10,11 +10,13 @@ ifndef ARCH
ARCH = $(shell $(CC) -dumpmachine)
endif
LDFLAGS+=-g -D_REENTRANT -L/usr/local/lib -L../capwap/$(ARCH)
LDFLAGS+=-g -D_REENTRANT -L/usr/local/lib -L../lib/$(ARCH)
CFLAGS += -Werror -g -O0 -D_REENTRANT -DIPV6 -I/usr/local/include -I../ -DSYS_ARCH=\"${ARCH}\"
LIBS+=-lcapwap
LIBS+=-lcipwap
LIBS+=-lcw
LIBS+=-lrt
LIBS+=-lpthread
LIBS+=-lconfuse
@ -75,7 +77,7 @@ all: $(AC_NAME)
$(AC_NAME): $(AC_OBJS)
$(CC) $(AC_OBJS) -o $(AC_NAME) $(LDFLAGS) $(LIBS)
$(CC) $(AC_OBJS) ../mod/modload_ac.o -o $(AC_NAME) $(LDFLAGS) $(LIBS)
clean:

View File

@ -134,7 +134,7 @@ static int init_acname()
return 1;
}
#include "capwap/mod.h"
#include "../mod/modload.h"
struct mod_ac * conf_mods[10];
@ -142,8 +142,8 @@ struct mod_ac * conf_mods[10];
static int init_mods()
{
conf_mods[0]=cw_get_mod_ac("cipwap");
conf_mods[1]=cw_get_mod_ac("capwap");
conf_mods[0]=modload_ac("cipwap");
conf_mods[1]=modload_ac("capwap");
conf_mods[2]=NULL;