diff options
| author | Jan Moskyto Matejka <mq@ucw.cz> | 2016-04-12 11:14:54 +0200 |
|---|---|---|
| committer | Jan Moskyto Matejka <mq@ucw.cz> | 2016-05-10 14:07:34 +0200 |
| commit | 7152e5efbb0fade868d5f2d2c7bc10ed52b3d19d (patch) | |
| tree | ebb3ff35e34cdf37c0757e0aa6a6e8de30a71278 /proto/rip | |
| parent | 4bdf1881dc6230b742d7efcaad8eeac4ed25f445 (diff) | |
Build system reworked to one global Makefile with includes and no nesting
Also removed the lib-dir merging with sysdep. Updated #include's
accordingly.
Fixed make doc on recent Debian together with moving generated doc into
objdir.
Moved Makefile.in into root dir
Retired all.o and birdlib.a
Linking the final binaries directly from all the .o files.
Diffstat (limited to 'proto/rip')
| -rw-r--r-- | proto/rip/Makefile | 9 | ||||
| -rw-r--r-- | proto/rip/rip.h | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/proto/rip/Makefile b/proto/rip/Makefile index d2d3c987..6e645cc2 100644 --- a/proto/rip/Makefile +++ b/proto/rip/Makefile @@ -1,5 +1,4 @@ -source=rip.c packets.c -root-rel=../../ -dir-name=proto/rip - -include ../../Rules +src := packets.c rip.c +obj := $(src-o-files) +$(all-daemon) +$(cf-local) diff --git a/proto/rip/rip.h b/proto/rip/rip.h index d1c9933c..7ec7e24d 100644 --- a/proto/rip/rip.h +++ b/proto/rip/rip.h @@ -24,7 +24,7 @@ #include "lib/resource.h" #include "lib/socket.h" #include "lib/string.h" -#include "lib/timer.h" +#include "sysdep/unix/timer.h" #define RIP_V1 1 |