Commit f5af7205 authored by Youness Alaoui's avatar Youness Alaoui

A bit of file shuffling

parent d3144956
...@@ -11,6 +11,7 @@ AC_CONFIG_FILES([ ...@@ -11,6 +11,7 @@ AC_CONFIG_FILES([
tests/Makefile tests/Makefile
stun/Makefile stun/Makefile
stun/tests/Makefile stun/tests/Makefile
stun/utils/Makefile
local/Makefile local/Makefile
udp/Makefile udp/Makefile
nice/Makefile nice/Makefile
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
# #
# Licensed under MPL 1.1/LGPL 2.1. See file COPYING. # Licensed under MPL 1.1/LGPL 2.1. See file COPYING.
SUBDIRS = . tests SUBDIRS = . utils tests
include $(top_srcdir)/common.mk include $(top_srcdir)/common.mk
...@@ -25,17 +25,10 @@ libstun_la_SOURCES = \ ...@@ -25,17 +25,10 @@ libstun_la_SOURCES = \
unknown.c \ unknown.c \
crc32.c hmac.c \ crc32.c hmac.c \
timer.h timer.c trans.h trans.c \ timer.h timer.c trans.h trans.c \
bind.h bind.c \ usages/stun-ice.c usages/stun-ice.h \
stun-ice.h stun-ice.c usages/bind.c usages/bind.h
libstun_la_LIBADD = $(OPENSSL_LIBS) $(LIBRT)
bin_PROGRAMS = stund stunbdc
check_PROGRAMS = stund
stund_SOURCES = stund.c stund.h libstun_la_LIBADD = $(OPENSSL_LIBS) $(LIBRT)
stund_LDADD = libstun.la -lpthread
stunbdc_LDADD = libstun.la
unknown.c: stun-msg.h build-unknown.sh unknown.c: stun-msg.h build-unknown.sh
rm -f unknown.c rm -f unknown.c
......
#! /bin/sh #! /bin/sh
STUNC=../stunbdc STUNC=../stunbdc
STUND=../stund STUND=../utils/stund
set -xe set -xe
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include "stun/bind.h" #include "stun/usages/bind.h"
#include "stun/stun-msg.h" #include "stun/stun-msg.h"
#include <stdlib.h> #include <stdlib.h>
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include "stun/stun-ice.h" #include "stun/usages/stun-ice.h"
#include "stun/stun-msg.h" #include "stun/stun-msg.h"
#include <stdlib.h> #include <stdlib.h>
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
* @brief STUN/ICE connectivity checks * @brief STUN/ICE connectivity checks
*/ */
# include "stun/bind.h" # include "stun/usages/bind.h"
# ifdef __cplusplus # ifdef __cplusplus
extern "C" { extern "C" {
......
#
# Makefile.am for the Nice Glib ICE library
#
# (C) 2006, 2007 Collabora Ltd.
# (C) 2006, 2007 Nokia Corporation. All rights reserved.
#
# Licensed under MPL 1.1/LGPL 2.1. See file COPYING.
#
include $(top_srcdir)/common.mk
AM_CFLAGS = -std=gnu99
AM_CPPFLAGS = -I$(top_srcdir)
bin_PROGRAMS = stunbdc stund
check_PROGRAMS = stund
stund_SOURCES = stund.c stund.h
stund_LDADD = ../libstun.la -lpthread
stunbdc_LDADD = ../libstun.la
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include "stun/bind.h" #include "stun/usages/bind.h"
#include <unistd.h> #include <unistd.h>
#include <getopt.h> #include <getopt.h>
......
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
/** Default port for STUN binding discovery */ /** Default port for STUN binding discovery */
#define IPPORT_STUN 3478 #define IPPORT_STUN 3478
#include "stun-msg.h" #include "stun/stun-msg.h"
#include "stund.h" #include "stund.h"
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment