move cmdl_test() to libsim/sim_test.c

fix Makefile
gitgjogh · Feb 2, 2017 · 500d20d · 500d20d
1 parent e1a5e42
commit 500d20d
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 25 deletions.
diff --git a/Makefile b/Makefile
@@ -9,7 +9,7 @@ CFLAGS = -c -O3
 LIBS = -lm
 
 TMPDIR = mk.tmp
-BINSRCS = ztest.c 
+BINSRCS = ztest.c
 BINOBJS = $(BINSRCS:%.c=$(TMPDIR)/%.o)
 OUTBIN = ztest
 
@@ -32,7 +32,7 @@ $(OUTBIN): $(BINOBJS) $(LIBSIM) $(LIBZBASE) | libzbase
 $(BINOBJS): $(LIBZBASE) Makefile
 $(BINOBJS): $(TMPDIR)/%.o:%.c | $(TMPDIR)
 	@echo; echo "[CC] compiling: $< "
-	$(CC) $(CFLAGS) -I$(LIBSIMDIRS) -I$(LIBZBASEDIRS) -l$(LIBSIM) -l$(LIBZBASE) -o $@ $<
+	$(CC) $(CFLAGS) -I$(LIBSIMDIRS) -I$(LIBZBASEDIRS) -o $@ $<
 
 .PHONY: libzbase
 libzbase $(LIBZBASE):

diff --git a/README.md b/README.md
@@ -22,24 +22,24 @@ For example, to allow users to specified the name/color/age for a pet, the devel
         { 0, "age",   1, cmdl_parse_int,  PET_OPT_M(age),   "0",       "pet's age",   },
     };
 
-Link the code to `libsim` and then you will got a program like this:
-
->   $ ./a.exe -h   
->      
-    -h,help ,   show help   
-    -name <%s>,         pet's name   
-    -color <%d>, [0],   pet's color   
-    -age <%d>, [0],     pet's age  
->
->   $ ./a.exe -name tom -color 2 -age 3
->
-    -h,help =
-    -name = 'tom'
-    -color = '2'
-    -age = '3'
-
-The full sample is in `libsim/sim_test.c`. Built it like this:
-
->   cd libsim   
->   make   #make libsim.a   
+Link the code to `libsim` and then you will got a program like this:
+
+>   $ ./a.exe -h   
+>      
+    -h,help ,   show help   
+    -name <%s>,         pet's name   
+    -color <%d>, [0],   pet's color   
+    -age <%d>, [0],     pet's age  
+>
+>   $ ./a.exe -name tom -color 2 -age 3
+>
+    -h,help =
+    -name = 'tom'
+    -color = '2'
+    -age = '3'
+
+The full sample is in `libsim/sim_test.c`. Built it like this:
+
+>   cd libsim   
+>   make   #make libsim.a   
 >   cc sim_test.c -o a.exe -L./ -lsim
diff --git a/libsim/Makefile b/libsim/Makefile
@@ -32,3 +32,9 @@ $(LIBSIMOBJS): $(TMPDIR)/%.o:%.c | $(TMPDIR)
 
 $(TMPDIR):
 	mkdir -p $@
+
+.PHONY: test
+test: sim_test
+sim_test: sim_test.c $(LIBSIM)
+	@echo; echo "[CC] sim_test.c"
+	$(CC) -D _SIM_TEST_ -o $@ $^
diff --git a/libsim/sim_test.c b/libsim/sim_test.c
@@ -60,3 +60,11 @@ int cmdl_test(int argc, char **argv)
 
     return 0;
 }
+
+#ifdef _SIM_TEST_
+int main(int argc, char **argv)
+{
+    xlog_init(SLOG_DEFULT);
+    return cmdl_test(argc, argv);
+}
+#endif
diff --git a/ztest.c b/ztest.c
@@ -341,7 +341,6 @@ int main(int argc, char **argv)
 {
     int i=0, j = 0;
     int exit_code = 0;
-    int cmdl_test(int argc, char **argv);
 
     typedef struct yuv_module {
         const char *name; 
@@ -351,8 +350,6 @@ int main(int argc, char **argv)
 
     const static yuv_module_t sub_main[] = {
         {"list",    zlist_test,     ""},
-        //{"opt",     zopt_test,      ""},
-        {"cmdl",    cmdl_test,      ""},
         {"array",   zarray_test,    ""},
         {"strq",    zstrq_test,     ""},
         {"hash",    zhash_test,     ""},