Reorganized sources slightly.

This commit is contained in:
Jan Vidar Krey 2009-07-25 20:05:27 +02:00
parent e281f61472
commit 36a07e3f7e
52 changed files with 72 additions and 69 deletions

View File

@ -21,6 +21,9 @@ ifeq ($(OS), Windows_NT)
WINDOWS ?= YES WINDOWS ?= YES
endif endif
CFLAGS += -I./src/
ifeq ($(WINDOWS),YES) ifeq ($(WINDOWS),YES)
USE_BIGENDIAN := NO USE_BIGENDIAN := NO
LDLIBS += -lws2_32 LDLIBS += -lws2_32
@ -132,60 +135,60 @@ endif
# Sources # Sources
libuhub_SOURCES := \ libuhub_SOURCES := \
src/auth.c \ src/core/auth.c \
src/commands.c \ src/core/commands.c \
src/config.c \ src/core/config.c \
src/eventqueue.c \ src/core/eventqueue.c \
src/hub.c \ src/core/hub.c \
src/hubevent.c \ src/core/hubevent.c \
src/hubio.c \ src/core/hubio.c \
src/inf.c \ src/core/inf.c \
src/ipcalc.c \ src/util/ipcalc.c \
src/list.c \ src/util/list.c \
src/log.c \ src/util/log.c \
src/memory.c \ src/util/memory.c \
src/message.c \ src/adc/message.c \
src/misc.c \ src/util/misc.c \
src/netevent.c \ src/core/netevent.c \
src/network.c \ src/network/network.c \
src/rbtree.c \ src/util/rbtree.c \
src/route.c \ src/core/route.c \
src/sid.c \ src/adc/sid.c \
src/tiger.c \ src/util/tiger.c \
src/user.c \ src/core/user.c \
src/usermanager.c src/core/usermanager.c
uhub_SOURCES := src/main.c uhub_SOURCES := src/core/main.c
adcrush_SOURCES := src/adcrush.c adcrush_SOURCES := src/adcrush.c
admin_SOURCES := src/admin.c admin_SOURCES := src/admin.c
uhub_HEADERS := \ uhub_HEADERS := \
src/adcconst.h \ src/adc/adcconst.h \
src/auth.h \ src/core/auth.h \
src/config.h \ src/core/config.h \
src/eventid.h \ src/core/eventid.h \
src/eventqueue.h \ src/core/eventqueue.h \
src/hub.h \ src/core/hub.h \
src/hubevent.h \ src/core/hubevent.h \
src/hubio.h \ src/core/hubio.h \
src/inf.h \ src/core/inf.h \
src/ipcalc.h \ src/util/ipcalc.h \
src/list.h \ src/util/list.h \
src/log.h \ src/util/log.h \
src/memory.h \ src/util/memory.h \
src/message.h \ src/adc/message.h \
src/misc.h \ src/util/misc.h \
src/netevent.h \ src/core/netevent.h \
src/network.h \ src/network/network.h \
src/rbtree.h \ src/util/rbtree.h \
src/route.h \ src/core/route.h \
src/sid.h \ src/adc/sid.h \
src/tiger.h \ src/util/tiger.h \
src/uhub.h \ src/uhub.h \
src/user.h \ src/core/user.h \
src/usermanager.h src/core/usermanager.h
autotest_SOURCES := \ autotest_SOURCES := \
autotest/test_message.tcc \ autotest/test_message.tcc \

View File

@ -148,7 +148,7 @@
#define INET6_ADDRSTRLEN 46 #define INET6_ADDRSTRLEN 46
#endif #endif
#include "adcconst.h" #include "adc/adcconst.h"
#define MIN(a, b) ((a) < (b) ? (a) : (b)) #define MIN(a, b) ((a) < (b) ? (a) : (b))
#define MAX(a, b) ((a) > (b) ? (a) : (b)) #define MAX(a, b) ((a) > (b) ? (a) : (b))
@ -157,28 +157,28 @@
extern "C" { extern "C" {
#endif #endif
#include "memory.h" #include "util/memory.h"
#include "misc.h" #include "util/misc.h"
#include "eventid.h" #include "core/eventid.h"
#include "eventqueue.h" #include "core/eventqueue.h"
#include "ipcalc.h" #include "util/ipcalc.h"
#include "list.h" #include "util/list.h"
#include "sid.h" #include "adc/sid.h"
#include "network.h" #include "network/network.h"
#include "netevent.h" #include "core/netevent.h"
#include "hubio.h" #include "core/hubio.h"
#include "auth.h" #include "core/auth.h"
#include "tiger.h" #include "util/tiger.h"
#include "config.h" #include "core/config.h"
#include "log.h" #include "util/log.h"
#include "user.h" #include "core/user.h"
#include "usermanager.h" #include "core/usermanager.h"
#include "message.h" #include "adc/message.h"
#include "route.h" #include "core/route.h"
#include "hub.h" #include "core/hub.h"
#include "commands.h" #include "core/commands.h"
#include "inf.h" #include "core/inf.h"
#include "hubevent.h" #include "core/hubevent.h"
#ifdef __cplusplus #ifdef __cplusplus
} }