]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
tweak
authorMichael Jerris <mike@jerris.com>
Fri, 26 Dec 2008 17:54:30 +0000 (17:54 +0000)
committerMichael Jerris <mike@jerris.com>
Fri, 26 Dec 2008 17:54:30 +0000 (17:54 +0000)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@10950 d0543943-73ff-0310-b7d9-9358b9ac24b2

libs/esl/Makefile
libs/esl/fs_cli.c

index 0de016ef1cdd7c40f7e54811e70d1d46c67dd936..69dda1af2fd5286cefac6472e8b3e4583325aa11 100644 (file)
@@ -4,7 +4,7 @@ DEBUG=-g -ggdb
 PICKY=-O2 -ffast-math -Wall -Werror -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes
 CFLAGS=$(INCS) -D_GNU_SOURCE $(DEBUG) -I$(LIBEDIT_DIR)/src/ $(PICKY)
 MYLIB=libesl.a
-LIBS=-lesl -lncurses -lpthread
+LIBS=-lncurses -lpthread -lesl
 LDFLAGS=-L.
 OBJS=src/esl.o src/esl_event.o src/esl_threadmutex.o src/esl_config.o
 SRC=src/esl.c src/esl_event.c src/esl_threadmutex.c src/esl_config.c
@@ -16,10 +16,6 @@ $(MYLIB): $(OBJS) $(HEADERS) $(SRC)
        ar rcs $(MYLIB) $(OBJS)
        ranlib $(MYLIB)
 
-$(OBJS): $(SRC) 
-       $(CC) $(CC_CFLAGS) $(CFLAGS) -c $< -o $@
-
-
 testserver: $(MYLIB) testserver.c
        $(CC) $(CC_CFLAGS) $(CFLAGS) testserver.c -o testserver $(LDFLAGS) $(LIBS)
 
index dfe15ddff62d22b720dcf6fef270793be1309f3f..49c1458180689983e4bf59b1388c7d51632acef9 100644 (file)
@@ -402,7 +402,7 @@ int main(int argc, char *argv[])
                                } else {
                                        snprintf(cmd_str, sizeof(cmd_str), "api %s\n\n", cmd);
                                        esl_send_recv(&handle, cmd_str);
-                                       if (handle.last_sr_event) {
+                                       if (handle.last_sr_event && handle.last_sr_event->body) {
                                                printf("%s\n", handle.last_sr_event->body);
                                        }
                                }