diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2014-10-07 23:21:34 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2014-10-07 23:21:34 +0200 |
| commit | 93097a178c6d0d50cbcfdf26a1a63fd571138484 (patch) | |
| tree | 0919df4cbd5660b0ec32132cf0e4fad38aa62210 | |
| parent | prepared build system for multiple binaries (diff) | |
cleanup for multiple binaries
| -rw-r--r-- | src/Makefile | 8 | ||||
| -rw-r--r-- | src/options-rtp.c (renamed from src/options.c) | 2 | ||||
| -rw-r--r-- | src/options-rtp.h (renamed from src/options.h) | 0 | ||||
| -rw-r--r-- | src/pipelines-rtp.c (renamed from src/pipelines.c) | 3 | ||||
| -rw-r--r-- | src/pipelines-rtp.h (renamed from src/pipelines.h) | 2 | ||||
| -rw-r--r-- | src/sydra-rtp.c | 4 |
6 files changed, 10 insertions, 9 deletions
diff --git a/src/Makefile b/src/Makefile index a45140b..0553f08 100644 --- a/src/Makefile +++ b/src/Makefile @@ -40,12 +40,12 @@ EXECUTABLE_RTP := sydra-rtp EXECUTABLES := $(EXECUTABLE_RTP) C_OBJS_COMMON := log.o \ - options.o \ - utils.o \ - pipelines.o \ - udp.o + utils.o C_OBJS_RTP := $(C_OBJS_COMMON) \ + options-rtp.o \ + pipelines-rtp.o \ + udp.o \ sydra-rtp.o C_SRCS_RTP := $(C_OBJS_RTP:%.o=%.c) diff --git a/src/options.c b/src/options-rtp.c index 9361759..70cc5fc 100644 --- a/src/options.c +++ b/src/options-rtp.c @@ -35,7 +35,7 @@ #include "datatypes.h" #include "config-rtp.h" -#include "options.h" +#include "options-rtp.h" #include "log.h" #include <stdio.h> diff --git a/src/options.h b/src/options-rtp.h index d7f7daf..d7f7daf 100644 --- a/src/options.h +++ b/src/options-rtp.h diff --git a/src/pipelines.c b/src/pipelines-rtp.c index 440f183..1a04c78 100644 --- a/src/pipelines.c +++ b/src/pipelines-rtp.c @@ -38,7 +38,8 @@ #include <stdio.h> #include <string.h> -#include "options.h" +#include "pipelines-rtp.h" +#include "options-rtp.h" #include "utils.h" #include "log.h" diff --git a/src/pipelines.h b/src/pipelines-rtp.h index 7f04813..a7ba5b6 100644 --- a/src/pipelines.h +++ b/src/pipelines-rtp.h @@ -37,7 +37,7 @@ #include "datatypes.h" #include <gst/gst.h> -#include "options.h" +#include "options-rtp.h" GstElement* create_sender_pipeline(options_t* opt, struct udp_sinks *udp); GstElement* create_receiver_pipeline(options_t* opt, struct udp_sources *udp); diff --git a/src/sydra-rtp.c b/src/sydra-rtp.c index dc6c3c7..ce5cda6 100644 --- a/src/sydra-rtp.c +++ b/src/sydra-rtp.c @@ -45,11 +45,11 @@ #include <gst/gst.h> #include "datatypes.h" -#include "options.h" +#include "options-rtp.h" #include "log.h" #include "daemon.h" #include "utils.h" -#include "pipelines.h" +#include "pipelines-rtp.h" #include "udp.h" |