From aed8b7f4da6a3c5de847f7cc05a385dba846f17d Mon Sep 17 00:00:00 2001 From: Matthew Brush Date: Mon, 4 Mar 2013 02:22:28 -0800 Subject: [PATCH] Move headers from include dir to src dir --- examples/Makefile.am | 4 ++-- src/Makefile.am | 9 ++++----- {include => src}/cfu.h | 0 {include => src}/cfuconf.h | 0 {include => src}/cfuhash.h | 0 {include => src}/cfulist.h | 0 {include => src}/cfuopt.h | 0 {include => src}/cfustring.h | 0 {include => src}/cfuthread_queue.h | 0 {include => src}/cfutime.h | 0 10 files changed, 6 insertions(+), 7 deletions(-) rename {include => src}/cfu.h (100%) rename {include => src}/cfuconf.h (100%) rename {include => src}/cfuhash.h (100%) rename {include => src}/cfulist.h (100%) rename {include => src}/cfuopt.h (100%) rename {include => src}/cfustring.h (100%) rename {include => src}/cfuthread_queue.h (100%) rename {include => src}/cfutime.h (100%) diff --git a/examples/Makefile.am b/examples/Makefile.am index b84fbd6..95cee62 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -2,9 +2,9 @@ noinst_PROGRAMS = hash_usage large_hash strings conf_example conf_example2 opt_e LDADD = -L$(top_srcdir)/src -lcfu if DEBUG -AM_CFLAGS = -I$(top_srcdir)/include -DCFU_DEBUG=1 +AM_CFLAGS = -I$(top_srcdir)/src -DCFU_DEBUG=1 else -AM_CFLAGS = -I$(top_srcdir)/include +AM_CFLAGS = -I$(top_srcdir)/src endif AM_LDFLAGS = -Xlinker -rpath -Xlinker $(top_src_dir)/src diff --git a/src/Makefile.am b/src/Makefile.am index 7090a73..464be82 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -10,11 +10,10 @@ else AM_CFLAGS = -Wall -W $(CFU_CONFIG_DEFINES) endif -include_HEADERS = $(top_srcdir)/include/cfu.h $(top_srcdir)/include/cfuhash.h \ - $(top_srcdir)/include/cfutime.h $(top_srcdir)/include/cfustring.h \ - $(top_srcdir)/include/cfulist.h $(top_srcdir)/include/cfuconf.h \ - $(top_srcdir)/include/cfuthread_queue.h $(top_srcdir)/include/cfutypes.h \ - $(top_srcdir)/include/cfuopt.h +include_HEADERS = $(top_srcdir)/src/cfu.h $(top_srcdir)/src/cfuhash.h \ + $(top_srcdir)/src/cfutime.h $(top_srcdir)/src/cfustring.h \ + $(top_srcdir)/src/cfulist.h $(top_srcdir)/src/cfuconf.h \ + $(top_srcdir)/src/cfuthread_queue.h $(top_srcdir)/src/cfuopt.h # libcfu_a_LDFLAGS = -lpthread INCLUDES = -I$(top_srcdir)/include diff --git a/include/cfu.h b/src/cfu.h similarity index 100% rename from include/cfu.h rename to src/cfu.h diff --git a/include/cfuconf.h b/src/cfuconf.h similarity index 100% rename from include/cfuconf.h rename to src/cfuconf.h diff --git a/include/cfuhash.h b/src/cfuhash.h similarity index 100% rename from include/cfuhash.h rename to src/cfuhash.h diff --git a/include/cfulist.h b/src/cfulist.h similarity index 100% rename from include/cfulist.h rename to src/cfulist.h diff --git a/include/cfuopt.h b/src/cfuopt.h similarity index 100% rename from include/cfuopt.h rename to src/cfuopt.h diff --git a/include/cfustring.h b/src/cfustring.h similarity index 100% rename from include/cfustring.h rename to src/cfustring.h diff --git a/include/cfuthread_queue.h b/src/cfuthread_queue.h similarity index 100% rename from include/cfuthread_queue.h rename to src/cfuthread_queue.h diff --git a/include/cfutime.h b/src/cfutime.h similarity index 100% rename from include/cfutime.h rename to src/cfutime.h