diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/charon/config/configuration_manager.h | 2 | ||||
| -rw-r--r-- | Source/charon/network/Makefile.network | 8 | ||||
| -rw-r--r-- | Source/charon/network/host.c (renamed from Source/charon/utils/host.c) | 0 | ||||
| -rw-r--r-- | Source/charon/network/host.h (renamed from Source/charon/utils/host.h) | 0 | ||||
| -rw-r--r-- | Source/charon/network/packet.h | 2 | ||||
| -rw-r--r-- | Source/charon/utils/Makefile.utils | 4 |
6 files changed, 8 insertions, 8 deletions
diff --git a/Source/charon/config/configuration_manager.h b/Source/charon/config/configuration_manager.h index b192c0cf7..a3bc099fd 100644 --- a/Source/charon/config/configuration_manager.h +++ b/Source/charon/config/configuration_manager.h @@ -25,7 +25,7 @@ #include <types.h> #include <utils/linked_list.h> -#include <utils/host.h> +#include <network/host.h> #include <encoding/payloads/transform_substructure.h> #include <transforms/prfs/prf.h> #include <transforms/signers/signer.h> diff --git a/Source/charon/network/Makefile.network b/Source/charon/network/Makefile.network index 3d600aced..034468354 100644 --- a/Source/charon/network/Makefile.network +++ b/Source/charon/network/Makefile.network @@ -18,7 +18,11 @@ NETWORK_DIR= $(MAIN_DIR)network/ OBJS+= $(BUILD_DIR)packet.o $(BUILD_DIR)packet.o : $(NETWORK_DIR)packet.c $(NETWORK_DIR)packet.h $(CC) $(CFLAGS) -c -o $@ $< - + OBJS+= $(BUILD_DIR)socket.o $(BUILD_DIR)socket.o : $(NETWORK_DIR)socket.c $(NETWORK_DIR)socket.h - $(CC) $(CFLAGS) -c -o $@ $<
\ No newline at end of file + $(CC) $(CFLAGS) -c -o $@ $< + +OBJS+= $(BUILD_DIR)host.o +$(BUILD_DIR)host.o : $(NETWORK_DIR)host.c $(NETWORK_DIR)host.h + $(CC) $(CFLAGS) -c -o $@ $<
\ No newline at end of file diff --git a/Source/charon/utils/host.c b/Source/charon/network/host.c index c2b01d175..c2b01d175 100644 --- a/Source/charon/utils/host.c +++ b/Source/charon/network/host.c diff --git a/Source/charon/utils/host.h b/Source/charon/network/host.h index f592e67eb..f592e67eb 100644 --- a/Source/charon/utils/host.h +++ b/Source/charon/network/host.h diff --git a/Source/charon/network/packet.h b/Source/charon/network/packet.h index 10488e0aa..b91756a03 100644 --- a/Source/charon/network/packet.h +++ b/Source/charon/network/packet.h @@ -25,7 +25,7 @@ #include <types.h> -#include <utils/host.h> +#include <network/host.h> diff --git a/Source/charon/utils/Makefile.utils b/Source/charon/utils/Makefile.utils index 20ea9f7b0..e66a0601f 100644 --- a/Source/charon/utils/Makefile.utils +++ b/Source/charon/utils/Makefile.utils @@ -23,10 +23,6 @@ OBJS+= $(BUILD_DIR)gmp_helper.o $(BUILD_DIR)gmp_helper.o : $(UTILS_DIR)gmp_helper.c $(UTILS_DIR)gmp_helper.h $(CC) $(CFLAGS) -c -o $@ $< -OBJS+= $(BUILD_DIR)host.o -$(BUILD_DIR)host.o : $(UTILS_DIR)host.c $(UTILS_DIR)host.h - $(CC) $(CFLAGS) -c -o $@ $< - OBJS+= $(BUILD_DIR)linked_list.o $(BUILD_DIR)linked_list.o : $(UTILS_DIR)linked_list.c $(UTILS_DIR)linked_list.h $(CC) $(CFLAGS) -c -o $@ $< |