Changeset 165

Timestamp:

01/03/09 20:33:47 (3 years ago)

Author:

bombadil

Message:

Reestructuracion del repositorio

Files:

• tags (moved) (moved from releases)
• trunk (moved) (moved from ella-src)
• trunk/Makefile.in (modified) (2 diffs)
• trunk/configure.ac (modified) (2 diffs)
• trunk/doc (moved) (moved from ella-doc)
• trunk/include/ella.h (modified) (1 diff)
• trunk/modules/Makefile.in (modified) (6 diffs)

trunk/Makefile.in

@@ -9 +9 @@
 export ECHO_PREFIX
 export CMD_PREFIX
+export OSNAME
 
 CC = @CC@
@@ -17 +18 @@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
+
+OSNAME=@OSNAME@
 
 MODULES = @MODULES@

trunk/configure.ac

@@ -77 +77 @@
 )
 
+OSNAME=$(uname -s)
+
 AC_SUBST(LIBS_CONSOLE)
 AC_SUBST(LIBS_COMMON)
@@ -83 +85 @@
 AC_SUBST(dependencias_LIBS)
 AC_SUBST(MODULES)
+AC_SUBST(OSNAME)
 
 AC_OUTPUT(Makefile common/Makefile main/Makefile modules/Makefile)
 
 echo "------------------------------------------------------------------------------------"
+echo "OSNAME                | ${OSNAME}"
 echo "EWS_CONFIG_DIR        | ${EWS_SYSCONF_DIR}/ews"
 echo "EWS_CONFIG_FILE       | ${EWS_SYSCONF_DIR}/ews/method.ini"

trunk/include/ella.h

@@ -10 +10 @@
 #include <netinet/in.h>
 #include <sys/socket.h>
+#include <sys/un.h>
 #include <arpa/inet.h>
 

trunk/modules/Makefile.in

@@ +1 @@
+ifneq ($(OSNAME),Darwin)
+SHARED = -shared
+else
+SHARED = -dynamiclib
+endif
+
 all: $(MODULES) ../common/libews0.so
 
@@ -7 +13 @@
 libdumb.so: dumb.o ../common/libews0.so $(INC)
         $(ECHO_PREFIX) echo "   [LD] $< -> $@"
-        $(CMD_PREFIX) $(CC) $(CFLAGS) $(LIBS_MODULES) -shared -Wl,-soname,libdumb.so -o libdumb.so dumb.o ../common/libews0.so -lc
+        $(CMD_PREFIX) $(CC) $(CFLAGS) $(LIBS_MODULES) $(SHARED) -Wl,-soname,libdumb.so -o libdumb.so dumb.o ../common/libews0.so -lc
 
 dumb.o: dumb.c
@@ -15 +21 @@
 libhttp.so: http.o ../common/libews0.so $(INC)
         $(ECHO_PREFIX) echo "   [LD] $< -> $@"
-        $(CMD_PREFIX) $(CC) $(CFLAGS) $(LIBS_MODULES) -shared -Wl,-soname,libhttp.so -o libhttp.so http.o ../common/libews0.so -lc
+        $(CMD_PREFIX) $(CC) $(CFLAGS) $(LIBS_MODULES) $(SHARED) -Wl,-soname,libhttp.so -o libhttp.so http.o ../common/libews0.so -lc
 
 http.o: http.c
@@ -23 +29 @@
 libmime.so: mime.o ../common/libews0.so $(INC)
         $(ECHO_PREFIX) echo "   [LD] $< -> $@"
-        $(CMD_PREFIX) $(CC) $(CFLAGS) $(LIBS_MODULES) -shared -Wl,-soname,libmime.so -o libmime.so mime.o ../common/libews0.so -lc
+        $(CMD_PREFIX) $(CC) $(CFLAGS) $(LIBS_MODULES) $(SHARED) -Wl,-soname,libmime.so -o libmime.so mime.o ../common/libews0.so -lc
 
 mime.o: mime.c
@@ -31 +37 @@
 libaccess.so: access.o ../common/libews0.so $(INC)
         $(ECHO_PREFIX) echo "   [LD] $< -> $@"
-        $(CMD_PREFIX) $(CC) $(CFLAGS) $(LIBS_MODULES) -shared -Wl,-soname,libaccess.so -o libaccess.so access.o ../common/libews0.so -lc
+        $(CMD_PREFIX) $(CC) $(CFLAGS) $(LIBS_MODULES) $(SHARED) -Wl,-soname,libaccess.so -o libaccess.so access.o ../common/libews0.so -lc
 
 access.o: access.c
@@ -39 +45 @@
 libcgi.so: cgi.o ../common/libews0.so $(INC)
         $(ECHO_PREFIX) echo "   [LD] $< -> $@"
-        $(CMD_PREFIX) $(CC) $(CFLAGS) $(LIBS_MODULES) -shared -Wl,-soname,libcgi.so -o libcgi.so cgi.o ../common/libews0.so -lc
+        $(CMD_PREFIX) $(CC) $(CFLAGS) $(LIBS_MODULES) $(SHARED) -Wl,-soname,libcgi.so -o libcgi.so cgi.o ../common/libews0.so -lc
 
 cgi.o: cgi.c