1
0
mirror of https://gitlab.labs.nic.cz/labs/bird.git synced 2024-05-11 16:54:54 +00:00

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.
This commit is contained in:
Jan Moskyto Matejka
2016-04-12 11:14:54 +02:00
parent 4bdf1881dc
commit 7152e5efbb
58 changed files with 371 additions and 508 deletions

5
sysdep/unix/Makefile Normal file
View File

@@ -0,0 +1,5 @@
src := io.c krt.c log.c main.c random.c
obj := $(src-o-files)
$(all-daemon)
$(cf-local)
$(conf-y-targets): $(s)krt.Y

View File

@@ -1,12 +0,0 @@
log.c
main.c
timer.h
io.c
unix.h
endian.h
config.Y
random.c
krt.c
krt.h
krt.Y

View File

@@ -8,7 +8,7 @@
CF_HDR
#include "lib/unix.h"
#include "sysdep/unix/unix.h"
#include <stdio.h>
CF_DECLS

View File

@@ -31,14 +31,14 @@
#include "nest/bird.h"
#include "lib/lists.h"
#include "lib/resource.h"
#include "lib/timer.h"
#include "sysdep/unix/timer.h"
#include "lib/socket.h"
#include "lib/event.h"
#include "lib/string.h"
#include "nest/iface.h"
#include "lib/unix.h"
#include "lib/sysio.h"
#include "sysdep/unix/unix.h"
#include CONFIG_INCLUDE_SYSIO_H
/* Maximum number of calls of tx handler for one socket in one
* select iteration. Should be small enough to not monopolize CPU by

View File

@@ -8,7 +8,7 @@
CF_HDR
#include "lib/krt.h"
#include "sysdep/unix/krt.h"
CF_DEFINES

View File

@@ -56,7 +56,7 @@
#include "nest/route.h"
#include "nest/protocol.h"
#include "filter/filter.h"
#include "lib/timer.h"
#include "sysdep/unix/timer.h"
#include "conf/conf.h"
#include "lib/string.h"

View File

@@ -15,7 +15,8 @@ struct krt_proto;
struct kif_config;
struct kif_proto;
#include "lib/krt-sys.h"
#include "sysdep/config.h"
#include CONFIG_INCLUDE_KRTSYS_H
/* Flags stored in net->n.flags, rest are in nest/route.h */
@@ -111,7 +112,7 @@ struct kif_proto {
struct kif_state sys; /* Sysdep state */
};
struct kif_proto *kif_proto;
extern struct kif_proto *kif_proto;
#define KIF_CF ((struct kif_config *)p->p.cf)

View File

@@ -26,7 +26,7 @@
#include "nest/mrtdump.h"
#include "lib/string.h"
#include "lib/lists.h"
#include "lib/unix.h"
#include "sysdep/unix/unix.h"
static FILE *dbgf;
static list *current_log_list;

View File

@@ -69,7 +69,7 @@ async_dump(void)
*/
#ifdef CONFIG_RESTRICTED_PRIVILEGES
#include "lib/syspriv.h"
#include CONFIG_INCLUDE_SYSPRIV_H
#else
static inline void
@@ -567,6 +567,10 @@ sysdep_shutdown_done(void)
* Signals
*/
volatile int async_config_flag;
volatile int async_dump_flag;
volatile int async_shutdown_flag;
static void
handle_sighup(int sig UNUSED)
{

View File

@@ -91,9 +91,9 @@ int sockaddr_read(sockaddr *sa, int af, ip_addr *a, struct iface **ifa, uint *po
#define SUN_LEN(ptr) ((size_t) (((struct sockaddr_un *) 0)->sun_path) + strlen ((ptr)->sun_path))
#endif
volatile int async_config_flag;
volatile int async_dump_flag;
volatile int async_shutdown_flag;
extern volatile int async_config_flag;
extern volatile int async_dump_flag;
extern volatile int async_shutdown_flag;
void io_init(void);
void io_loop(void);