diff --git a/GNUmakefile b/GNUmakefile index 0852867..3df429f 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -13,7 +13,7 @@ LIBS=byte.a fmt.a scan.a str.a uint.a open.a stralloc.a unix.a socket.a \ buffer.a mmap.a taia.a tai.a dns.a case.a mult.a array.a io.a \ textcode.a cdb.a critbit.a -all: ent $(LIBS) libowfat.a libsocket t compile_commands.json +all: ent $(LIBS) libowfat.a libsocket t pic pie: $(MAKE) CC="gcc -fPIC" LDFLAGS="-fpie" @@ -1371,6 +1371,17 @@ Makefile: GNUmakefile dep libdep -e 's/^VERSION=.*/'VERSION=$(VERSION)/ \ -e 's/^CURNAME=.*/'CURNAME=$(CURNAME)/ \ -e 's/ Makefile//' < GNUmakefile >> $@ + +srcdirs=$(subst :, ,$(VPATH)) +srcfiles=$(foreach dir,$(srcdirs),$(wildcard $(dir)/*.c)) + +compile_commands.json.tmpl: json + ./json $(srcfiles) > $@ + +compile_commands.json: compile_commands.json.tmpl + sed -e 's#"@"#"$(PWD)"#' < $< > $@ + +all: compile_commands.json #cutend windoze: @@ -1411,11 +1422,3 @@ check2: haveuint128.h haveinline.h entities.h check: haveuint128.h haveinline.h $(TESTS) -srcdirs=$(subst :, ,$(VPATH)) -srcfiles=$(foreach dir,$(srcdirs),$(wildcard $(dir)/*.c)) - -compile_commands.json.tmpl: json - ./json $(srcfiles) > $@ - -compile_commands.json: compile_commands.json.tmpl - sed -e 's#"@"#"$(PWD)"#' < $< > $@ diff --git a/Makefile b/Makefile index 057ee0f..afb2d83 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ LIBS=byte.a fmt.a scan.a str.a uint.a open.a stralloc.a unix.a socket.a \ buffer.a mmap.a taia.a tai.a dns.a case.a mult.a array.a io.a \ textcode.a cdb.a critbit.a -all: ent $(LIBS) libowfat.a libsocket t compile_commands.json +all: ent $(LIBS) libowfat.a libsocket t pic pie: $(MAKE) CC="gcc -fPIC" LDFLAGS="-fpie" @@ -1080,7 +1080,7 @@ DNS_OBJS=dns_dfd.o dns_domain.o dns_dtda.o dns_ip.o dns_ip6.o dns_ipq.o dns_ipq6 CASE_OBJS=case_diffb.o case_diffs.o case_lowerb.o case_lowers.o case_starts.o MULT_OBJS=imult16.o imult32.o imult64.o range_arrayinbuf.o range_str2inbuf.o range_str4inbuf.o range_strinbuf.o umult16.o umult32.o umult64.o ARRAY_OBJS=array_allocate.o array_bytes.o array_cat.o array_cat0.o array_catb.o array_cate.o array_cats.o array_cats0.o array_equal.o array_fail.o array_get.o array_length.o array_reset.o array_start.o array_trunc.o array_truncate.o iarray_allocate.o iarray_free.o iarray_get.o iarray_init.o iarray_length.o -IO_OBJS=io_appendfile.o io_block.o io_canread.o io_canwrite.o io_check.o io_close.o io_closeonexec.o io_createfile.o io_debugstring.o io_dontwantread.o io_dontwantwrite.o io_eagain.o io_eagain_read.o io_eagain_write.o io_fd.o io_finishandshutdown.o io_getcookie.o io_mmapwritefile.o io_nonblock.o io_passfd.o io_pipe.o io_readfile.o io_readwritefile.o io_receivefd.o io_sendfile.o io_setcookie.o io_sigpipe.o io_socketpair.o io_timedout.o io_timeout.o io_timeouted.o io_tryread.o io_tryreadtimeout.o io_trywrite.o io_trywritetimeout.o io_wait.o io_waitread.o io_waituntil.o io_waituntil2.o io_waitwrite.o io_wantread.o io_wantwrite.o iob_addbuf.o iob_addbuf_free.o iob_addbuf_internal.o iob_addbuf_munmap.o iob_addfile.o iob_addfile_close.o iob_adds.o iob_adds_free.o iob_bytesleft.o iob_free.o iob_new.o iob_prefetch.o iob_reset.o iob_send.o iob_write.o iom_abort.o iom_add.o iom_init.o iom_wait.o +IO_OBJS=io_appendfile.o io_block.o io_canread.o io_canwrite.o io_check.o io_close.o io_closeonexec.o io_createfile.o io_debugstring.o io_dontwantread.o io_dontwantwrite.o io_eagain.o io_eagain_read.o io_eagain_write.o io_fd.o io_finishandshutdown.o io_getcookie.o io_mmapwritefile.o io_nonblock.o io_passfd.o io_pipe.o io_readfile.o io_readwritefile.o io_receivefd.o io_sendfile.o io_setcookie.o io_sigpipe.o io_socketpair.o io_timedout.o io_timeout.o io_timeouted.o io_tryread.o io_tryreadtimeout.o io_trywrite.o io_trywritetimeout.o io_wait.o io_waitread.o io_waituntil.o io_waituntil2.o io_waitwrite.o io_wantread.o io_wantwrite.o iob_addbuf.o iob_addbuf_free.o iob_addbuf_internal.o iob_addbuf_munmap.o iob_addfile.o iob_addfile_close.o iob_adds.o iob_adds_free.o iob_bytesleft.o iob_free.o iob_new.o iob_prefetch.o iob_reset.o iob_send.o iob_write.o TEXTCODE_OBJS=base64.o base64url.o fmt_base64.o fmt_base64url.o fmt_cescape.o fmt_foldwhitespace.o fmt_hexdump.o fmt_html.o fmt_html_tagarg.o fmt_jsonescape.o fmt_ldapescape.o fmt_ldapescape2.o fmt_quotedprintable.o fmt_to_array.o fmt_to_sa.o fmt_tofrom_array.o fmt_urlencoded.o fmt_uuencoded.o fmt_xml.o fmt_yenc.o scan_base64.o scan_base64url.o scan_cescape.o scan_hexdump.o scan_html.o scan_jsonescape.o scan_ldapescape.o scan_quotedprintable.o scan_to_array.o scan_to_sa.o scan_tofrom_array.o scan_urlencoded.o scan_uuencoded.o scan_yenc.o CDB_OBJS=cdb.o cdb_hash.o cdb_make.o cdb_traverse.o CRITBIT_OBJS=critbit.o @@ -1180,7 +1180,7 @@ uninstall: rm -f $(LIBDIR)/libowfat.a VERSION=libowfat-0.34 -CURNAME=libowfat-0.34 +CURNAME=libowfat-0.32 tar: clean rename compile_commands.json rm -f dep libdep @@ -1349,11 +1349,3 @@ check2: haveuint128.h haveinline.h entities.h check: haveuint128.h haveinline.h $(TESTS) -srcdirs=$(subst :, ,$(VPATH)) -srcfiles=$(foreach dir,$(srcdirs),$(wildcard $(dir)/*.c)) - -compile_commands.json.tmpl: json - ./json $(srcfiles) > $@ - -compile_commands.json: compile_commands.json.tmpl - sed -e 's#"@"#"$(PWD)"#' < $< > $@