Skip to content
This repository was archived by the owner on May 27, 2025. It is now read-only.

Commit 42284d1

Browse files
committed
remove json files - install json debian package instead
1 parent 18ee161 commit 42284d1

File tree

4 files changed

+4
-1368
lines changed

4 files changed

+4
-1368
lines changed

bin/Makefile

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,10 @@ am_ch_checkns_OBJECTS = ch-checkns.$(OBJEXT) ch_misc.$(OBJEXT)
119119
ch_checkns_OBJECTS = $(am_ch_checkns_OBJECTS)
120120
ch_checkns_LDADD = $(LDADD)
121121
am__ch_run_SOURCES_DIST = ch-run.c ch_core.h ch_core.c ch_misc.h \
122-
ch_misc.c ch_fuse.h ch_fuse.c json.h json.c
122+
ch_misc.c ch_fuse.h ch_fuse.c
123123
am__objects_1 = ch_run-ch_fuse.$(OBJEXT)
124124
am_ch_run_OBJECTS = ch_run-ch-run.$(OBJEXT) ch_run-ch_core.$(OBJEXT) \
125-
ch_run-ch_misc.$(OBJEXT) ch_run-json.$(OBJEXT) $(am__objects_1)
125+
ch_run-ch_misc.$(OBJEXT) $(am__objects_1)
126126
ch_run_OBJECTS = $(am_ch_run_OBJECTS)
127127
am__DEPENDENCIES_1 =
128128
ch_run_DEPENDENCIES = $(am__DEPENDENCIES_1)
@@ -173,8 +173,7 @@ depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
173173
am__maybe_remake_depfiles = depfiles
174174
am__depfiles_remade = ./$(DEPDIR)/ch-checkns.Po ./$(DEPDIR)/ch_misc.Po \
175175
./$(DEPDIR)/ch_run-ch-run.Po ./$(DEPDIR)/ch_run-ch_core.Po \
176-
./$(DEPDIR)/ch_run-ch_fuse.Po ./$(DEPDIR)/ch_run-ch_misc.Po \
177-
./$(DEPDIR)/ch_run-json.Po
176+
./$(DEPDIR)/ch_run-ch_fuse.Po ./$(DEPDIR)/ch_run-ch_misc.Po
178177
am__mv = mv -f
179178
AM_V_lt = $(am__v_lt_$(V))
180179
am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
@@ -364,7 +363,7 @@ top_builddir = ..
364363
top_srcdir = ..
365364
ch_checkns_SOURCES = ch-checkns.c ch_misc.h ch_misc.c
366365
ch_run_SOURCES = ch-run.c ch_core.h ch_core.c ch_misc.h ch_misc.c \
367-
json.h json.c $(am__append_1)
366+
$(am__append_1)
368367
ch_run_CFLAGS = $(CFLAGS) $(PTHREAD_CFLAGS)
369368
ch_run_LDADD = $(CH_RUN_LIBS)
370369
dist_bin_SCRIPTS = ch-convert \
@@ -557,7 +556,6 @@ include ./$(DEPDIR)/ch_run-ch-run.Po # am--include-marker
557556
include ./$(DEPDIR)/ch_run-ch_core.Po # am--include-marker
558557
include ./$(DEPDIR)/ch_run-ch_fuse.Po # am--include-marker
559558
include ./$(DEPDIR)/ch_run-ch_misc.Po # am--include-marker
560-
include ./$(DEPDIR)/ch_run-json.Po # am--include-marker
561559

562560
$(am__depfiles_remade):
563561
@$(MKDIR_P) $(@D)
@@ -637,20 +635,6 @@ ch_run-ch_fuse.obj: ch_fuse.c
637635
# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
638636
# $(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ch_run_CFLAGS) $(CFLAGS) -c -o ch_run-ch_fuse.obj `if test -f 'ch_fuse.c'; then $(CYGPATH_W) 'ch_fuse.c'; else $(CYGPATH_W) '$(srcdir)/ch_fuse.c'; fi`
639637

640-
ch_run-json.o: json.c
641-
$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ch_run_CFLAGS) $(CFLAGS) -MT ch_run-json.o -MD -MP -MF $(DEPDIR)/ch_run-json.Tpo -c -o ch_run-json.o `test -f 'json.c' || echo '$(srcdir)/'`json.c
642-
$(AM_V_at)$(am__mv) $(DEPDIR)/ch_run-json.Tpo $(DEPDIR)/ch_run-json.Po
643-
# $(AM_V_CC)source='json.c' object='ch_run-json.o' libtool=no \
644-
# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
645-
# $(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ch_run_CFLAGS) $(CFLAGS) -c -o ch_run-json.o `test -f 'json.c' || echo '$(srcdir)/'`json.c
646-
647-
ch_run-json.obj: json.c
648-
$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ch_run_CFLAGS) $(CFLAGS) -MT ch_run-json.obj -MD -MP -MF $(DEPDIR)/ch_run-json.Tpo -c -o ch_run-json.obj `if test -f 'json.c'; then $(CYGPATH_W) 'json.c'; else $(CYGPATH_W) '$(srcdir)/json.c'; fi`
649-
$(AM_V_at)$(am__mv) $(DEPDIR)/ch_run-json.Tpo $(DEPDIR)/ch_run-json.Po
650-
# $(AM_V_CC)source='json.c' object='ch_run-json.obj' libtool=no \
651-
# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
652-
# $(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ch_run_CFLAGS) $(CFLAGS) -c -o ch_run-json.obj `if test -f 'json.c'; then $(CYGPATH_W) 'json.c'; else $(CYGPATH_W) '$(srcdir)/json.c'; fi`
653-
654638
ID: $(am__tagged_files)
655639
$(am__define_uniq_tagged_files); mkid -fID $$unique
656640
tags: tags-am
@@ -784,7 +768,6 @@ distclean: distclean-am
784768
-rm -f ./$(DEPDIR)/ch_run-ch_core.Po
785769
-rm -f ./$(DEPDIR)/ch_run-ch_fuse.Po
786770
-rm -f ./$(DEPDIR)/ch_run-ch_misc.Po
787-
-rm -f ./$(DEPDIR)/ch_run-json.Po
788771
-rm -f Makefile
789772
distclean-am: clean-am distclean-compile distclean-generic \
790773
distclean-hdr distclean-tags
@@ -837,7 +820,6 @@ maintainer-clean: maintainer-clean-am
837820
-rm -f ./$(DEPDIR)/ch_run-ch_core.Po
838821
-rm -f ./$(DEPDIR)/ch_run-ch_fuse.Po
839822
-rm -f ./$(DEPDIR)/ch_run-ch_misc.Po
840-
-rm -f ./$(DEPDIR)/ch_run-json.Po
841823
-rm -f Makefile
842824
maintainer-clean-am: distclean-am maintainer-clean-generic
843825

bin/ch-run.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include "config.h"
1616
#include "ch_core.h"
1717
#include "ch_misc.h"
18-
#include "json.h"
1918

2019
/** Constants and macros **/
2120

0 commit comments

Comments
 (0)