rename project to 'abc', move to 'src/' dir, rename include to '<abc/*>'

11 files changed, 31 insertions, 35 deletions

diff --git a/.gitignore b/.gitignore
index 77e4b21..1c6e7d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,6 @@
 .libs/
 Makefile
 Makefile.in
-
 /aclocal.m4
 /autom4te.cache
 /build-aux
@@ -11,6 +10,3 @@ Makefile.in
 /configure
 /libtool
 /stamp-h1
-
-/libabc-*.tar.xz
-/test-libabc
diff --git a/Makefile.am b/Makefile.am
index 067b4e5..1ac18d0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,9 +5,10 @@ AM_MAKEFLAGS = --no-print-directory
 
 AM_CPPFLAGS = \
 	-include $(top_builddir)/config.h \
-	-I${top_srcdir} \
 	-DSYSCONFDIR=\""$(sysconfdir)"\" \
-	-DLIBEXECDIR=\""$(libexecdir)"\"
+	-DLIBEXECDIR=\""$(libexecdir)"\" \
+	-I${top_srcdir}/src/abc \
+	-I${top_srcdir}/src
 
 AM_CFLAGS = ${my_CFLAGS} \
 	-fvisibility=hidden \
@@ -34,27 +35,27 @@ LIBABC_CURRENT=2
 LIBABC_REVISION=0
 LIBABC_AGE=2
 
-pkginclude_HEADERS = libabc/libabc.h
-lib_LTLIBRARIES = libabc/libabc.la
+pkginclude_HEADERS = src/abc/libabc.h
+lib_LTLIBRARIES = src/libabc.la
 
-libabc_libabc_la_SOURCES =\
-	libabc/libabc-private.h \
-	libabc/libabc.c
+src_libabc_la_SOURCES =\
+	src/libabc-private.h \
+	src/libabc.c
 
-EXTRA_DIST += libabc/libabc.sym
+EXTRA_DIST += src/libabc.sym
 
-libabc_libabc_la_LDFLAGS = $(AM_LDFLAGS) \
+src_libabc_la_LDFLAGS = $(AM_LDFLAGS) \
 	-version-info $(LIBABC_CURRENT):$(LIBABC_REVISION):$(LIBABC_AGE) \
-	-Wl,--version-script=$(top_srcdir)/libabc/libabc.sym
-libabc_libabc_la_DEPENDENCIES = ${top_srcdir}/libabc/libabc.sym
+	-Wl,--version-script=$(top_srcdir)/src/libabc.sym
+src_libabc_la_DEPENDENCIES = ${top_srcdir}/src/libabc.sym
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libabc/libabc.pc
-EXTRA_DIST += libabc/libabc.pc.in
-CLEANFILES += libabc/libabc.pc
+pkgconfig_DATA = src/libabc.pc
+EXTRA_DIST += src/libabc.pc.in
+CLEANFILES += src/libabc.pc
 
-TESTS = libabc/test-libabc
+TESTS = src/test-libabc
 
-check_PROGRAMS = libabc/test-libabc
-libabc_test_libabc_SOURCES = libabc/test-libabc.c
-libabc_test_libabc_LDADD = libabc/libabc.la
+check_PROGRAMS = src/test-libabc
+src_test_libabc_SOURCES = src/test-libabc.c
+src_test_libabc_LDADD = src/libabc.la
diff --git a/configure.ac b/configure.ac
index 295d18f..d8e394a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
 AC_PREREQ(2.60)
-AC_INIT([libabc],
+AC_INIT([abc],
 	[4],
-	[libabc-devel@example.com],
-	[libabc],
-	[http://www.example.com/libs/libabc/])
-AC_CONFIG_SRCDIR([libabc/libabc.c])
+	[abc-devel@example.com],
+	[abc],
+	[http://www.example.com/abc/])
+AC_CONFIG_SRCDIR([src/libabc.c])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([check-news foreign 1.11 -Wall -Wno-portability silent-rules tar-pax no-dist-gzip dist-xz subdir-objects])
 AC_PROG_CC_STDC
@@ -48,7 +48,7 @@ AC_CONFIG_FILES([
 AC_OUTPUT
 AC_MSG_RESULT([
 	$PACKAGE $VERSION
-	========
+	=====
 
 	prefix:			${prefix}
 	sysconfdir:		${sysconfdir}
diff --git a/libabc/.gitignore b/src/.gitignore
index faa121b..5e25d6d 100644
--- a/libabc/.gitignore
+++ b/src/.gitignore
@@ -4,3 +4,4 @@
 *.la
 *.lo
 libabc.pc
+test-libabc
diff --git a/libabc/COPYING b/src/COPYING
index 8add30a..47044a8 100644
--- a/libabc/COPYING
+++ b/src/COPYING
@@ -146,7 +146,7 @@ such a program is covered only if its contents constitute a work based
 on the Library (independent of the use of the Library in a tool for
 writing it).  Whether that is true depends on what the Library does
 and what the program that uses the Library does.
-  
+
   1. You may copy and distribute verbatim copies of the Library's
 complete source code as you receive it, in any medium, provided that
 you conspicuously and appropriately publish on each copy an
@@ -500,5 +500,3 @@ necessary.  Here is a sample; alter the names:
   Ty Coon, President of Vice
 
 That's all there is to it!
-
-
diff --git a/libabc/libabc.h b/src/abc/libabc.h
index e2b3a69..e2b3a69 100644
--- a/libabc/libabc.h
+++ b/src/abc/libabc.h
diff --git a/libabc/libabc-private.h b/src/libabc-private.h
index 19bd458..0129030 100644
--- a/libabc/libabc-private.h
+++ b/src/libabc-private.h
@@ -24,7 +24,7 @@
 #include <stdbool.h>
 #include <syslog.h>
 
-#include <libabc/libabc.h>
+#include <abc/libabc.h>
 
 static inline void __attribute__((always_inline, format(printf, 2, 3)))
 abc_log_null(struct abc_ctx *ctx, const char *format, ...) {}
diff --git a/libabc/libabc.c b/src/libabc.c
index 329b43b..5cce72a 100644
--- a/libabc/libabc.c
+++ b/src/libabc.c
@@ -1,5 +1,5 @@
 /*
-  libabc - something with abc
+  abc - something with abc
 
   Copyright (C) 2011 Someone <someone@example.com>
 
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <ctype.h>
 
-#include <libabc/libabc.h>
+#include <abc/libabc.h>
 #include "libabc-private.h"
 
 /**
diff --git a/libabc/libabc.pc.in b/src/libabc.pc.in
index 2fc7b76..2fc7b76 100644
--- a/libabc/libabc.pc.in
+++ b/src/libabc.pc.in
diff --git a/libabc/libabc.sym b/src/libabc.sym
index f391e8a..f391e8a 100644
--- a/libabc/libabc.sym
+++ b/src/libabc.sym
diff --git a/libabc/test-libabc.c b/src/test-libabc.c
index 6965c6c..631c127 100644
--- a/libabc/test-libabc.c
+++ b/src/test-libabc.c
@@ -27,7 +27,7 @@
 #include <errno.h>
 #include <unistd.h>
 
-#include <libabc/libabc.h>
+#include <abc/libabc.h>
 
 int main(int argc, char *argv[])
 {