Changeset 4704 for pjproject/trunk/pjlib-util/build/Makefile

Timestamp:

Jan 16, 2014 5:30:46 AM (11 years ago)

Author:

ming

Message:

Closed #1723: Merging pjsua2 branch into trunk

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• pjlib-util/build/Makefile (modified) (2 diffs)

pjproject/trunk/pjlib-util/build/Makefile

@@ -39 +39 @@
                 base64.o cli.o cli_console.o cli_telnet.o crc32.o errno.o dns.o \
                 dns_dump.o dns_server.o getopt.o hmac_md5.o hmac_sha1.o \
-                http_client.o md5.o pcap.o resolver.o scanner.o sha1.o \
+                http_client.o json.o md5.o pcap.o resolver.o scanner.o sha1.o \
                 srv_resolver.o string.o stun_simple.o \
                 stun_simple_client.o xml.o
@@ -51 +51 @@
 export UTIL_TEST_SRCDIR = ../src/pjlib-util-test
 export UTIL_TEST_OBJS += xml.o encryption.o stun.o resolver_test.o test.o \
-                http_client.o
+                json_test.o http_client.o
 export UTIL_TEST_CFLAGS += $(_CFLAGS)
 export UTIL_TEST_CXXFLAGS += $(_CXXFLAGS)