Integrate with config.h.

This commit is contained in:
Taeho Oh 2016-01-23 21:43:16 +09:00
parent 58b5e627e7
commit d2ff67d462
2 changed files with 3 additions and 46 deletions

View File

@ -1,43 +0,0 @@
DEBUG = y
OMVS_VERSION = 0.1
TARGET = omvs
OBJS = \
omvs_main.o \
omvs_gst.o
CC = gcc
LD = gcc
RM = rm -rf
PKGS = gstreamer-1.0 gio-2.0
CFLAGS = -I. `pkg-config --cflags $(PKGS)` `pcap-config --cflags`
CFLAGS += -std=gnu99 -W -Wall -Wno-unused-result -pedantic
CFLAGS += -DOMVS_VERSION=\"$(OMVS_VERSION)\"
LDFLAGS = `pkg-config --libs $(PKGS)` `pcap-config --libs`
ifeq ($(DEBUG),y)
CFLAGS += -g -O0
LDFLAGS += -g -O0
else
CFLAGS += -O2 -DG_DISABLE_CHECKS -DG_DISABLE_ASSERT
LDFLAGS += -O2
endif
.PHONY: all clean run
all: $(TARGET)
clean:
$(RM) $(TARGET) $(OBJS)
run: $(TARGET)
ifeq ($(DEBUG), y)
ulimit -c unlimited ; G_MESSAGES_DEBUG=all ./$(TARGET)
else
./$(TARGET)
endif
$(TARGET): $(OBJS)
$(LD) -o $@ $^ $(LDFLAGS)
%.o: %.c
$(CC) $(CFLAGS) -c -o $@ $<

View File

@ -5,6 +5,7 @@
#include <gio/gio.h> #include <gio/gio.h>
#include <gst/gst.h> #include <gst/gst.h>
#include "config.h"
#include "omvs_gst.h" #include "omvs_gst.h"
#define _OMVS_IPPROTO_UDP 17 #define _OMVS_IPPROTO_UDP 17
@ -418,9 +419,8 @@ int main(int argc, char *argv[]) {
"omvs scans to find free video streaming multicast ip addresses." "omvs scans to find free video streaming multicast ip addresses."
); );
g_option_context_set_description(context, g_option_context_set_description(context,
"Oh! Multicast Video Scanner " OMVS_VERSION " is" PACKAGE_STRING " is Written by Taeho Oh <ohhara@postech.edu>.\n"
" Written by Taeho Oh <ohhara@postech.edu>.\n" PACKAGE_URL "\n");
"http://ohhara.sarang.net");
g_option_context_add_main_entries(context, _omvs_entries, NULL); g_option_context_add_main_entries(context, _omvs_entries, NULL);
g_option_context_add_group(context, gst_init_get_option_group()); g_option_context_add_group(context, gst_init_get_option_group());
if (!g_option_context_parse(context, &argc, &argv, &error)) { if (!g_option_context_parse(context, &argc, &argv, &error)) {