Changeset 176 for trunk

Timestamp:

30/07/09 01:15:39 (3 years ago)

Author:

bombadil

Message:

include files relocation

Location:

trunk

Files:

• Makefile.in (modified) (4 diffs)
• common/configurator.c (modified) (1 diff)
• common/connector.c (modified) (1 diff)
• common/date.c (modified) (1 diff)
• common/logger.c (modified) (1 diff)
• common/memory.c (modified) (1 diff)
• common/string.c (modified) (1 diff)
• configure.ac (modified) (2 diffs)
• include/Darwin (deleted)
• include/Linux (deleted)
• include/cli.h (deleted)
• include/configurator.h (deleted)
• include/connector.h (deleted)
• include/date.h (deleted)
• include/ella (added)
• include/ella.h (added)
• include/ella/Darwin (added)
• include/ella/Darwin/config.h (added)
• include/ella/Linux (added)
• include/ella/Linux/config.h (added)
• include/ella/cli.h (added)
• include/ella/configurator.h (added)
• include/ella/connector.h (added)
• include/ella/date.h (added)
• include/ella/header.h (added)
• include/ella/logger.h (added)
• include/ella/main.h (added)
• include/ella/memory.h (added)
• include/ella/modules.h (added)
• include/ella/string.h (added)
• include/header.h (deleted)
• include/logger.h (deleted)
• include/main.h (deleted)
• include/memory.h (deleted)
• include/modules.h (deleted)
• include/string.h (deleted)
• main/cli.c (modified) (1 diff)
• main/configurator.c (modified) (1 diff)
• main/connector.c (modified) (1 diff)
• main/console.c (modified) (1 diff)
• main/ewsc.c (modified) (1 diff)
• main/ewsd.c (modified) (1 diff)
• main/modules.c (modified) (1 diff)
• modules/dumb.c (modified) (1 diff)
• modules/mime.c (modified) (1 diff)

trunk/Makefile.in

@@ -39 +39 @@
 endif
 
-INC = ../include/configurator.h \
-      ../include/config.h \
-      ../include/connector.h \
-      ../include/header.h \
-      ../include/logger.h \
-      ../include/memory.h \
-      ../include/string.h
+INC = ../include/ella/configurator.h \
+      ../include/ella/config.h \
+      ../include/ella/connector.h \
+      ../include/ella/header.h \
+      ../include/ella/logger.h \
+      ../include/ella/memory.h \
+      ../include/ella/string.h
 
 all: ewsd
@@ -66 +66 @@
 distclean: clean
         $(ECHO_PREFIX) echo "   [RM] config.* Makefile"
-        $(RM) config.* Makefile common/Makefile main/Makefile modules/Makefile include/config.h include/config.in include/*~
+        $(RM) config.* Makefile common/Makefile main/Makefile modules/Makefile include/ella/config.h include/ella/config.in include/*~
 
 maintainer-clean: develclean
@@ -99 +99 @@
         $(ECHO_PREFIX) [ -f /etc/debian_version ] && echo "   [CP] debian/ewsd -> /etc/init.d" || true
         $(CMD_PREFIX) [ -f /etc/debian_version ] && cp debian/ewsd /etc/init.d || true
+        $(ECHO_PREFIX) [ -d @prefix@/include/ella ] || echo "   [MKDIR]" @prefix@/include/ella
+        $(CMD_PREFIX) [ -d @prefix@/include/ella ] || mkdir -p @prefix@/include/ella
+        $(ECHO_PREFIX) echo "   [CP] include/ella/*.h ->" @prefix@/include/ella
+        $(CMD_PREFIX) cp include/ella/*.h @prefix@/include/ella
+        $(ECHO_PREFIX) echo "   [CP] include/ella.h ->" @prefix@/include
+        $(CMD_PREFIX) cp include/ella.h @prefix@/include
 
 uninstall:
@@ -112 +118 @@
         $(ECHO_PREFIX) [ -f /etc/debian_version ] && echo "   [RM] /etc/init.d/ewsd"
         $(CMD_PREFIX) [ -f /etc/debian_version ] && $(RM) /etc/init.d/ewsd
+        $(ECHO_PREFIX) [ -d @prefix@/include/ella ] && echo "   [RM] @prefix@/include/ella/*.h"
+        $(CMD_PREFIX) [ -d @prefix@/include/ella ] && $(RM) -r @prefix@/include/ella
+        $(ECHO_PREFIX) [ -d @prefix@/include/ella.h ] && echo "   [RM] @prefix@/include/ella.h"
+        $(CMD_PREFIX) [ -d @prefix@/include/ella.h ] && $(RM) @prefix@/include/ella.h

trunk/common/configurator.c

@@ -1 +1 @@
 /* -*- mode:C; coding:utf-8 -*- */
 
-#include "../include/configurator.h"
+#include "../include/ella.h"
 
 configBlock* ews_new_block( char *name, char *lastname ) {

trunk/common/connector.c

@@ -1 +1 @@
 /* -*- mode:C; coding:utf-8 -*- */
 
-#include "../include/connector.h"
+#include "../include/ella.h"
 
 bindConnect* ews_connector_parse_bind( configBlock *cb, moduleTAD* modules ) {

trunk/common/date.c

@@ -1 @@
-#include "../include/date.h"
+/* -*- mode:C; coding:utf-8 -*- */
+
+#include "../include/ella.h"
 
 void set_current_date( char *s ) {

trunk/common/logger.c

@@ -1 +1 @@
 /* -*- mode:C; coding:utf-8 -*- */
 
-#include "../include/logger.h"
+#include "../include/ella.h"
 
 #define EWS_LOGGER_MAX_FDS 128

trunk/common/memory.c

@@ -1 +1 @@
 /* -*- mode:C; coding:utf-8 -*- */
 
-#include "../include/memory.h"
+#include "../include/ella.h"
 
 pthread_mutex_t memory_allocation = PTHREAD_MUTEX_INITIALIZER;

trunk/common/string.c

@@ -1 +1 @@
 /* -*- mode:C; coding:utf-8 -*- */
 
-#include "../include/string.h"
+#include "../include/ella.h"
 
 char* ews_chomp( char *s ) {

trunk/configure.ac

@@ -1 +1 @@
 AC_INIT(ews, 0.1, bombadil@bosqueviejo.net)
 
-AC_CONFIG_HEADER(include/config.h:include/config.in)
+AC_CONFIG_HEADER(include/ella/config.h:include/ella/config.in)
 
 EWS_SYSCONF_DIR=$(eval eval eval eval "echo $sysconfdir")
@@ -26 +26 @@
 AC_DEFINE_UNQUOTED(EWS_CONSOLE_SOCKET, "${EWS_LOCAL_STATE_DIR}/run/ews/ews.ctl", [socket file])
 AC_DEFINE_UNQUOTED(EWS_OSNAME, "$(uname -s)", [OS Name])
-AC_DEFINE_UNQUOTED(EWS_OS_INCLUDE, "$(uname -s)/config.h", [OS specific include])
+AC_DEFINE_UNQUOTED(EWS_OS_INCLUDE, "ella/$(uname -s)/config.h", [OS specific include])
 
 EWS_CONFIG_STATIC=yes

trunk/main/cli.c

@@ -1 +1 @@
 /* -*- mode:C; coding:utf-8 -*- */
 
-#include "../include/main.h"
+#include "../include/ella/main.h"
 
 static cliCommand **commands = NULL;

trunk/main/configurator.c

@@ -1 +1 @@
 /* -*- mode:C; coding:utf-8 -*- */
 
-#include "../include/main.h"
+#include "../include/ella/main.h"
 
 configBlock *config_block = NULL; //!< stores all config blocks.

trunk/main/connector.c

@@ -1 +1 @@
 /* -*- mode:C; coding:utf-8 -*- */
 
-#include "../include/main.h"
+#include "../include/ella/main.h"
 
 // TODO: get this data from config file

trunk/main/console.c

@@ -1 +1 @@
 /* -*- mode:C; coding:utf-8 -*- */
 
-#include "../include/main.h"
+#include "../include/ella/main.h"
 
 #define EWS_MAX_CONNECTS 128

trunk/main/ewsc.c

@@ -9 +9 @@
 #include <unistd.h>
 
-#include "../include/config.h"
+#include "../include/ella/config.h"
 
 int main(void) {

trunk/main/ewsd.c

@@ -1 +1 @@
 /* -*- mode:C; coding:utf-8 -*- */
 
-#include "../include/main.h"
+#include "../include/ella/main.h"
 
 void stop_ews( int d ) {

trunk/main/modules.c

@@ -1 +1 @@
 /* -*- mode:C; coding:utf-8 -*- */
 
-#include "../include/main.h"
+#include "../include/ella/main.h"
 
 static moduleTAD *modules = NULL;

trunk/modules/dumb.c

@@ -1 +1 @@
 #include <string.h>
-#include "../include/modules.h"
-#include "../include/header.h"
-#include "../include/connector.h"
+#include "../include/ella.h"
 
 void dumb_get_status( char *s ) {

trunk/modules/mime.c

@@ -2 +2 @@
 #include <string.h>
 
-#include "../include/memory.h"
-#include "../include/modules.h"
-#include "../include/header.h"
-#include "../include/connector.h"
-#include "../include/logger.h"
+#include "../include/ella.h"
 
 struct Mime_Types {