diff options
| author | Yunchih Chen <yunchih.cat@gmail.com> | 2018-03-05 10:40:57 +0800 |
|---|---|---|
| committer | Yunchih Chen <yunchih.cat@gmail.com> | 2018-03-05 10:40:57 +0800 |
| commit | dd91a91704b76c3f46b841d86f5cedee684e7fa9 (patch) | |
| tree | 422cdd00ae93fff7b5418966513445a16d232f13 | |
| parent | 692a091becf285adbc606758125a735c10c8287d (diff) | |
| download | nfcollect-dd91a91704b76c3f46b841d86f5cedee684e7fa9.tar nfcollect-dd91a91704b76c3f46b841d86f5cedee684e7fa9.tar.gz nfcollect-dd91a91704b76c3f46b841d86f5cedee684e7fa9.tar.bz2 nfcollect-dd91a91704b76c3f46b841d86f5cedee684e7fa9.tar.lz nfcollect-dd91a91704b76c3f46b841d86f5cedee684e7fa9.tar.xz nfcollect-dd91a91704b76c3f46b841d86f5cedee684e7fa9.tar.zst nfcollect-dd91a91704b76c3f46b841d86f5cedee684e7fa9.zip | |
Switch to new project layout
| -rw-r--r-- | .gitignore | 6 | ||||
| -rw-r--r-- | Makefile.am | 9 | ||||
| -rw-r--r-- | bin/nfcollect.c (renamed from nfcollect.c) | 0 | ||||
| -rw-r--r-- | bin/nfextract.c (renamed from nfextract.c) | 0 | ||||
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | include/collect.h (renamed from collect.h) | 0 | ||||
| -rw-r--r-- | include/commit.h (renamed from commit.h) | 0 | ||||
| -rw-r--r-- | include/common.h (renamed from common.h) | 0 | ||||
| -rw-r--r-- | include/extract.h (renamed from extract.h) | 0 | ||||
| -rw-r--r-- | include/main.h (renamed from main.h) | 1 | ||||
| -rw-r--r-- | lib/collect.c (renamed from collect.c) | 0 | ||||
| -rw-r--r-- | lib/commit.c (renamed from commit.c) | 0 | ||||
| -rw-r--r-- | lib/common.c (renamed from common.c) | 0 | ||||
| -rw-r--r-- | lib/extract.c (renamed from extract.c) | 0 |
14 files changed, 19 insertions, 6 deletions
@@ -8,3 +8,9 @@ autom4te.cache aclocal.* Makefile.in Makefile +*.Po +.Tpo +*.deps +.dirstamp +nfcollect +nfextract diff --git a/Makefile.am b/Makefile.am index f2b5310..cf6dd98 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,8 @@ bin_PROGRAMS = nfcollect nfextract -nfcollect_SOURCES = commit.c collect.c common.c nfcollect.c -nfextract_SOURCES = common.c extract.c nfextract.c + +AM_CFLAGS = \ + -I$(top_srcdir)/include \ + -Werror -Wall -Wno-address-of-packed-member + +nfcollect_SOURCES = lib/common.c lib/commit.c lib/collect.c bin/nfcollect.c +nfextract_SOURCES = lib/common.c lib/extract.c bin/nfextract.c diff --git a/nfcollect.c b/bin/nfcollect.c index 10ad512..10ad512 100644 --- a/nfcollect.c +++ b/bin/nfcollect.c diff --git a/nfextract.c b/bin/nfextract.c index 884665a..884665a 100644 --- a/nfextract.c +++ b/bin/nfextract.c diff --git a/configure.ac b/configure.ac index f84c323..79e8c11 100644 --- a/configure.ac +++ b/configure.ac @@ -10,11 +10,14 @@ AC_CONFIG_AUX_DIR([build-aux]) # Init automake, and specify this program use relaxed structures. # i.e. this program doesn't follow the gnu coding standards, and doesn't have # ChangeLog, COPYING, AUTHORS, INSTALL, README etc. files. -AM_INIT_AUTOMAKE([-Wall -Werror foreign dist-xz]) +AM_INIT_AUTOMAKE([-Wall -Werror foreign dist-xz subdir-objects]) -AC_PROG_CC +AM_SILENT_RULES([yes]) +AC_CONFIG_SRCDIR([bin/nfcollect.c]) -AC_DEFINE(DEBUG) +AC_PROG_CC([clang]) + +AC_DEFINE([DEBUG], [1], [Enable debug]) AC_CHECK_HEADERS(libnetfilter_log/libnetfilter_log.h) AC_SEARCH_LIBS(nflog_open, netfilter_log) diff --git a/collect.h b/include/collect.h index 98eee4d..98eee4d 100644 --- a/collect.h +++ b/include/collect.h diff --git a/commit.h b/include/commit.h index d61fbe2..d61fbe2 100644 --- a/commit.h +++ b/include/commit.h diff --git a/common.h b/include/common.h index 6030780..6030780 100644 --- a/common.h +++ b/include/common.h diff --git a/extract.h b/include/extract.h index 233f557..233f557 100644 --- a/extract.h +++ b/include/extract.h @@ -1,4 +1,3 @@ - // The MIT License (MIT) // Copyright (c) 2017 Yun-Chih Chen diff --git a/collect.c b/lib/collect.c index faef7b8..faef7b8 100644 --- a/collect.c +++ b/lib/collect.c diff --git a/extract.c b/lib/extract.c index b33d183..b33d183 100644 --- a/extract.c +++ b/lib/extract.c |