Changeset 74 in libcf

Timestamp:

04/15/13 15:01:50 (11 years ago)

Author:

cheese

Message:

#1 fix makefile bug

Location:

trunk

Files:

• makeinclude/platform.mk (modified) (3 diffs)
• src/cf_socket.c (modified) (1 diff)
• src/makefile (modified) (2 diffs)
• test/makefile (modified) (2 diffs)

trunk/makeinclude/platform.mk

@@ -21 +21 @@
 EXT_SHARED  = so
 EXT_STATIC  = a
+EXT_EXECUTE = ex
 
 #------------------------------------------------------------
@@ -84 +85 @@
     EXT_SHARED  = dll
     EXT_STATIC  = lib
+    EXT_EXECUTE = exe
 
     # run as linux
@@ -109 +111 @@
 CDEFS           = $(DEFS) -D_AIX -D_REENTRANT
 CFLAGS          = $(FLAG) -q$(VER) -qcpluscmt
-LDFLAGS         = -b$(VER) -lc -brtl
+LDFLAGS         = -b$(VER) -lc -brtl -bexpall
 SHARED_FLAGS    = $(LDFLAGS) -bnoentry -bM:SRE
 ARFLAGS         = 

trunk/src/cf_socket.c

@@ -25 +25 @@
 # include <fcntl.h>
 # include <errno.h>
+# include <sys/select.h>
 /* }}} for linux/unix */
 #endif

trunk/src/makefile

@@ -32 +32 @@
 #----------------------------------------------------------
 all: $(OBJ_PATH) $(TARGET_PATH) $(TARGET)
-    @echo ========== Complete CHEROXY compilation ==========
+    @echo ========== Complete LIBCF compilation ==========
 $(TARGET_PATH): dummy
     @if [ ! -d $@ ] ; then mkdir $@ ; fi
@@ -40 +40 @@
 # link
 $(TARGET_PATH)/%.$(EXT_SHARED): $(OBJS)
-    $(LD) $(SHARED_FLAGS) -o $@ $?
+    $(LD) $(SHARED_FLAGS) -o $@ $? $(LIBS)
 
 $(TARGET_PATH)/%.$(EXT_STATIC): $(OBJS)

trunk/test/makefile

@@ -13 +13 @@
 TARGET_NAME     = test
 
-CC              = gcc
-LD              = gcc
-AR              = ar
-CDEFS           = $(DEFS) -DLINUX -DUNIX -DMTHREAD -D_REENTRANT
-CFLAGS          = $(PLATFORM) $(FLAG) -Wall -Wconversion -Wpointer-arith -Wcast-align -fPIC
-LDFLAGS         = $(PLATFORM) -Wl,-Bsymbolic
-SHARED_FLAGS    = $(LDFLAGS) -shared
-ARFLAGS         = rc
-
-SOURCE_TYPE     = c
 TARGET_PATH     = ../_build
 OBJ_PATH        = ../_obj
@@ -50 +40 @@
 %: %.c
     make dep
-    $(LD) $(LDFLAGS) $(LIBS) $(CDEFS) $(CFLAGS) $(INCLUDES) -o $(TARGET_PATH)/$@.$(EXT_EXECUTE) $?
+    $(CC) $(LDFLAGS) $(LIBS) $(CDEFS) $(CFLAGS) $(INCLUDES) -o $(TARGET_PATH)/$@.$(EXT_EXECUTE) $?
     cd $(TARGET_PATH); LD_LIBRARY_PATH=. ./$@.$(EXT_EXECUTE)