From f266782e5ed8e83661e8982f2378ab06a74c36a1 Mon Sep 17 00:00:00 2001
From: darkcoven <admin@darkcoven.tk>
Date: Mon, 1 Apr 2013 19:02:54 +0200
Subject: [PATCH] Lib: moved lib include file to 'include' subdirectory.

Debug and release versions names do not differ.
---
 cli/Makefile                | 13 ++++++-------
 lib/{ => include}/ngadmin.h |  0
 lib/ngadmin                 |  2 +-
 lib/src/Makefile            |  7 +++----
 4 files changed, 10 insertions(+), 12 deletions(-)
 rename lib/{ => include}/ngadmin.h (100%)

diff --git a/cli/Makefile b/cli/Makefile
index ffaf5d6..3f7f576 100644
--- a/cli/Makefile
+++ b/cli/Makefile
@@ -1,20 +1,19 @@
 
 CC=gcc
-CFLAGS=-I../lib -W -Wall -Wextra -Os
-LDFLAGS=-L../lib -lreadline
+CFLAGS=-I../lib/include/ -W -Wall -Wextra -Os
+LDFLAGS=-L../lib -lngadmin -lreadline
+EXEC=admin
 
 SRC=$(wildcard *.c)
 OBJ=$(SRC:.c=.o)
 
 
 ifeq ($(DEBUG), yes)
-EXEC=admind
 CFLAGS+=-g
-LDFLAGS+=-lngadmind -g
+LDFLAGS+=-g
 else
-EXEC=admin
 CFLAGS+=-fomit-frame-pointer
-LDFLAGS+=-lngadmin -s
+LDFLAGS+=-s
 endif
 
 
@@ -29,7 +28,7 @@ clean:
 	@rm -f *.o
 
 mrproper: clean
-	@rm -f admin admind
+	@rm -f $(EXEC)
 
 
 
diff --git a/lib/ngadmin.h b/lib/include/ngadmin.h
similarity index 100%
rename from lib/ngadmin.h
rename to lib/include/ngadmin.h
diff --git a/lib/ngadmin b/lib/ngadmin
index 88c95d4..bd11a78 100644
--- a/lib/ngadmin
+++ b/lib/ngadmin
@@ -580,7 +580,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = .
+INPUT                  = include
 
 # This tag can be used to specify the character encoding of the source files 
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
diff --git a/lib/src/Makefile b/lib/src/Makefile
index 1148ba3..786f827 100644
--- a/lib/src/Makefile
+++ b/lib/src/Makefile
@@ -1,18 +1,17 @@
 
 CC=gcc
-CFLAGS=-DBUILD_LIB -I.. -W -Wall -Wextra -Os -fno-strict-aliasing -fvisibility=hidden -fPIC
+CFLAGS=-DBUILD_LIB -I../include/ -W -Wall -Wextra -Os -fno-strict-aliasing -fvisibility=hidden -fPIC
 LDFLAGS=
+EXEC=../libngadmin.so
 
 SRC=$(wildcard *.c)
 OBJ=$(SRC:.c=.o)
 
 
 ifeq ($(DEBUG), yes)
-EXEC=../libngadmind.so
 CFLAGS+=-g
 LDFLAGS+=-g
 else
-EXEC=../libngadmin.so
 CFLAGS+=-fomit-frame-pointer
 LDFLAGS+=-s
 endif
@@ -29,6 +28,6 @@ clean:
 	@rm -f *.o
 
 mrproper: clean
-	@rm -f ../libngadmin.so ../libngadmind.so
+	@rm -f $(EXEC)
 
 
-- 
2.39.5