Use new RSTP library.

[people/ms/rstp.git] / Makefile

diff --git a/Makefile b/Makefile
index 4840a00cfbc6162d96949de426b09a0a8f04f3b5..c65dd39c2ffbba73c540d76931bda99536926c1f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 
-DSOURCES =  brstate.c libnetlink.c epoll_loop.c bridge_track.c \
+DSOURCES =  brstate.c libnetlink.c epoll_loop.c bridge_track.c rstp.c \
           packet.c ctl_socket.c netif_utils.c main.c brmon.c
 
 DOBJECTS = $(DSOURCES:.c=.o)
@@ -9,24 +9,18 @@ CTLSOURCES = ctl_main.c ctl_cli_wrap.c ctl_socket_client.c
 CTLOBJECTS = $(CTLSOURCES:.c=.o)
 
 CC=gcc
-CFLAGS = -Wall -Werror -O2 -g -D_REENTRANT -D__LINUX__ -DVERSION=$(version) -DBUILD=$(build) -I. -I./include -I./rstplib
+CFLAGS = -Wall -Werror -O2 -g -D_REENTRANT -D__LINUX__ -DVERSION=$(version) -DBUILD=$(build) -I. -I./include
 
 all: rstpd rstpctl
 
-rstplib:
-       make -C rstplib librstp.a
-
-.PHONY: rstplib
-
-rstpd: $(DOBJECTS) rstplib
-       $(CC) -o $@ $(DOBJECTS) -L ./rstplib -lrstp
+rstpd: $(DOBJECTS)
+       $(CC) -o $@ $(DOBJECTS)
 
 rstpctl: $(CTLOBJECTS)
        $(CC) -o $@ $(CTLOBJECTS)
 
 clean:
        rm -f *.o rstpd rstpctl
-       make -C rstplib clean
        rm -fr $(TOPDIR) $(BUILDDIR)
 
 install: all
@@ -38,7 +32,7 @@ install: all
        install -m 644 rstpctl.8 $(INSTALLPREFIX)/usr/share/man/man8
 
 # RPM Building, as non root
-version := 0.16
+version := 0.21
 build := 1
 
 BUILDROOT := $(CURDIR)/rpm_buildroot