diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-21 14:51:13 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-21 14:51:13 +0200 |
commit | 5209a846a9157e649fcdcb561f7eaf19c8c0e465 (patch) | |
tree | b0a7e52b5646c8eec182dbc391e7934b6804488c /source4/lib/json/Makefile.am | |
parent | 625359b2e266105022309df8985720108ecd6f67 (diff) | |
parent | 2ee8d29d22bcb1c350ab59d71b0aee548489bc9c (diff) | |
download | samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.tar.gz samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.tar.bz2 samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.zip |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into regsrv
Conflicts:
source4/lib/registry/ldb.c
source4/rpc_server/winreg/rpc_winreg.c
Diffstat (limited to 'source4/lib/json/Makefile.am')
-rw-r--r-- | source4/lib/json/Makefile.am | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/source4/lib/json/Makefile.am b/source4/lib/json/Makefile.am deleted file mode 100644 index 4b01dc16bf..0000000000 --- a/source4/lib/json/Makefile.am +++ /dev/null @@ -1,36 +0,0 @@ -CFLAGS = -Wall -std=gnu99 -D_GNU_SOURCE -D_REENTRANT - -lib_LTLIBRARIES = libjson.la - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = json.pc - -libjsonincludedir = $(includedir)/json -libjsoninclude_HEADERS = \ - json.h \ - bits.h \ - debug.h \ - linkhash.h \ - arraylist.h \ - json_util.h \ - json_object.h \ - json_tokener.h - -libjson_la_LDFLAGS = -version-info 0:1:0 - -libjson_la_SOURCES = \ - arraylist.c \ - debug.c \ - json_object.c \ - json_tokener.c \ - json_util.c \ - linkhash.c \ - printbuf.c - -check_PROGRAMS = test1 test2 - -test1_SOURCES = test1.c -test1_LDADD = $(lib_LTLIBRARIES) - -test2_SOURCES = test2.c -test2_LDADD = $(lib_LTLIBRARIES) |