@@ -31,9 +31,9 @@ COPTFLAGS_xlc_release= -qpic -qoptimize=4
3131COPTFLAGS = $(COPTFLAGS_$(CCOM ) _$(OPTIMISE ) )
3232COPTFLAGS_FOR_BUILD = $(COPTFLAGS_$(CCOM_FOR_BUILD ) _$(OPTIMISE ) )
3333
34- CSTDFLAGS_gcc = -std=c99 -pedantic
35- CSTDFLAGS_clang = -std=c99 -pedantic
36- CSTDFLAGS_xlc = -qlanglvl=stdc99
34+ CSTDFLAGS_gcc = -std=c11 -pedantic
35+ CSTDFLAGS_clang = -std=c11 -pedantic
36+ CSTDFLAGS_xlc = -qlanglvl=stdc11
3737CSTDFLAGS = $(CSTDFLAGS_$(CCOM ) )
3838CSTDFLAGS_FOR_BUILD = $(CSTDFLAGS_$(CCOM_FOR_BUILD ) )
3939
@@ -47,10 +47,10 @@ CFLAGS_FOR_BUILD= $(CSTDFLAGS_FOR_BUILD) $(COPTFLAGS_FOR_BUILD) -I@SRCDIR@/inclu
4747
4848# ############# CPPFLAGS ######################
4949ENV_CPPFLAGS = @ENV_CPPFLAGS@
50- CPPFLAGS = -DHAVE_CONFIG_H=1 -DHAVE_SYS_QUEUE_H=1 -DHAVE_GETOPT_H=1 -D_XOPEN_SOURCE=600 $(ENV_CPPFLAGS )
50+ CPPFLAGS = -DHAVE_CONFIG_H=1 -DHAVE_SYS_QUEUE_H=1 -DHAVE_GETOPT_H=1 -D_XOPEN_SOURCE=700 $(ENV_CPPFLAGS )
5151
5252ENV_CPPFLAGS_FOR_BUILD = @ENV_CPPFLAGS_FOR_BUILD@
53- CPPFLAGS_FOR_BUILD = -DHAVE_CONFIG_H -DYY_NO_UNPUT -DYY_NO_INPUT -D_XOPEN_SOURCE=600 $(ENV_CPPFLAGS_FOR_BUILD )
53+ CPPFLAGS_FOR_BUILD = -DHAVE_CONFIG_H -DYY_NO_UNPUT -DYY_NO_INPUT -D_XOPEN_SOURCE=700 $(ENV_CPPFLAGS_FOR_BUILD )
5454
5555# CFLAGS for dependency tracking for various compilers
5656CCDEPFLAGS_gcc = -MD -MF ${@:.o=.d}
@@ -70,19 +70,28 @@ LIBATFC_LIBS= @LIBATFC_LIBS@
7070LIBEDIT_FOUND = @LIBEDIT_FOUND@
7171LIBEDIT_CFLAGS_1 = @LIBEDIT_CFLAGS@
7272LIBEDIT_LIBS_1 = @LIBEDIT_LIBS@
73- LIBEDIT_CFLAGS = ${ LIBEDIT_CFLAGS_$(LIBEDIT_FOUND ) }
74- LIBEDIT_LIBS = ${ LIBEDIT_LIBS_$(LIBEDIT_FOUND ) }
73+ LIBEDIT_CFLAGS = $( LIBEDIT_CFLAGS_$(LIBEDIT_FOUND ) )
74+ LIBEDIT_LIBS = $( LIBEDIT_LIBS_$(LIBEDIT_FOUND ) )
7575LIBEDIT_CPPFLAGS_1 = -DHAVE_LIBEDIT=1
76- LIBEDIT_CPPFLAGS = ${ LIBEDIT_CPPFLAGS_$(LIBEDIT_FOUND ) }
76+ LIBEDIT_CPPFLAGS = $( LIBEDIT_CPPFLAGS_$(LIBEDIT_FOUND ) )
7777
7878# ############# READLINE #########################################
7979LIBREADLINE_FOUND = @LIBREADLINE_FOUND@
8080LIBREADLINE_CFLAGS_1 = @LIBREADLINE_CFLAGS@
8181LIBREADLINE_LIBS_1 = @LIBREADLINE_LIBS@
82- LIBREADLINE_CFLAGS = ${ LIBREADLINE_CFLAGS_$(LIBREADLINE_FOUND ) }
83- LIBREADLINE_LIBS = ${ LIBREADLINE_LIBS_$(LIBREADLINE_FOUND ) }
82+ LIBREADLINE_CFLAGS = $( LIBREADLINE_CFLAGS_$(LIBREADLINE_FOUND ) )
83+ LIBREADLINE_LIBS = $( LIBREADLINE_LIBS_$(LIBREADLINE_FOUND ) )
8484LIBREADLINE_CPPFLAGS_1 = -DHAVE_LIBREADLINE=1
85- LIBREADLINE_CPPFLAGS = ${LIBREADLINE_CPPFLAGS_$(LIBREADLINE_FOUND ) }
85+ LIBREADLINE_CPPFLAGS = $(LIBREADLINE_CPPFLAGS_$(LIBREADLINE_FOUND ) )
86+
87+ # ############# LOWDOWN #########################################
88+ LIBLOWDOWN_FOUND = @LIBLOWDOWN_FOUND@
89+ LIBLOWDOWN_CFLAGS_1 = @LIBLOWDOWN_CFLAGS@
90+ LIBLOWDOWN_LIBS_1 = @LIBLOWDOWN_LIBS@
91+ LIBLOWDOWN_CFLAGS = $(LIBLOWDOWN_CFLAGS_$(LIBLOWDOWN_FOUND ) )
92+ LIBLOWDOWN_LIBS = $(LIBLOWDOWN_LIBS_$(LIBLOWDOWN_FOUND ) )
93+ LIBLOWDOWN_CPPFLAGS_1 = -DHAVE_LIBLOWDOWN=1
94+ LIBLOWDOWN_CPPFLAGS = $(LIBLOWDOWN_CPPFLAGS_$(LIBLOWDOWN_FOUND ) )
8695
8796# ############# LIBCRYPTO ########################################
8897LIBCRYPTO_CFLAGS = @LIBCRYPTO_CFLAGS@
@@ -282,11 +291,12 @@ $(TEMPLATE_HEADERS) $(TEMPLATE_SRCS): pgen
282291gcli : libgcli.a $(GCLI_OBJS )
283292 $(CCACHE ) $(CC ) $(CFLAGS ) $(CPPFLAGS ) $(LDFLAGS ) -o gcli \
284293 $(GCLI_OBJS ) libgcli.a $(LIBCURL_LIBS ) $(LIBEDIT_LIBS ) \
285- $(LIBREADLINE_LIBS ) $(LIBCRYPTO_LIBS )
294+ $(LIBREADLINE_LIBS ) $(LIBCRYPTO_LIBS ) \
295+ $(LIBLOWDOWN_LIBS )
286296
287297libgcli.a : $(LIBGCLI_OBJS )
288- $(AR ) -rc libgcli.a $(LIBGCLI_OBJS )
289- $(RANLIB ) libgcli.a
298+ $(CCACHE ) $( AR ) -rc libgcli.a $(LIBGCLI_OBJS )
299+ $(CCACHE ) $( RANLIB ) libgcli.a
290300
291301$(LIBGCLI_OBJS ) : $(TEMPLATE_HEADERS ) $(TEMPLATE_SRCS )
292302
@@ -295,6 +305,7 @@ $(LIBGCLI_OBJS): $(TEMPLATE_HEADERS) $(TEMPLATE_SRCS)
295305 @mkdir -p $$(dirname $@ )
296306 $(CCACHE ) $(CC ) $(CFLAGS ) $(CCDEPFLAGS ) $(CPPFLAGS ) \
297307 $(LIBCURL_CFLAGS ) $(LIBCRYPTO_CFLAGS ) \
308+ $(LIBLOWDOWN_CFLAGS ) $(LIBLOWDOWN_CPPFLAGS ) \
298309 -DIN_LIBGCLI=1 -c -o $@ $<
299310
300311.c.gcli.o :
@@ -303,6 +314,7 @@ $(LIBGCLI_OBJS): $(TEMPLATE_HEADERS) $(TEMPLATE_SRCS)
303314 $(LIBEDIT_CPPFLAGS ) $(LIBREADLINE_CPPFLAGS ) \
304315 $(LIBCURL_CFLAGS ) $(LIBEDIT_CFLAGS ) \
305316 $(LIBREADLINE_CFLAGS ) $(LIBCRYPTO_CFLAGS ) \
317+ $(LIBLOWDOWN_CFLAGS ) $(LIBLOWDOWN_CPPFLAGS ) \
306318 -c -o $@ $<
307319
308320.c.pgen.o :
@@ -319,19 +331,29 @@ clean-auto:
319331 $(TEST_PROGRAMS ) \
320332 $(MANPAGES )
321333
334+ # ##### TEST SUITE #####################################
322335TEST_PROGRAMS = \
323336 tests/json-escape \
324337 tests/github-parse \
325338 tests/gitlab-parse \
326339 tests/gitea-parse \
327340 tests/bugzilla-parse \
328341 tests/url-encode \
329- tests/pretty-print \
330342 tests/jsongen \
331343 tests/base64 \
332344 tests/difftests
333345
334- $(TEST_PROGRAMS ) : libgcli.a $(TEST_PROGRAMS:=.tests.o )
346+ tests/json-escape : tests/json-escape.tests.o
347+ tests/github-parse : tests/github-parse.tests.o
348+ tests/gitlab-parse : tests/gitlab-parse.tests.o
349+ tests/gitea-parse : tests/gitea-parse.tests.o
350+ tests/bugzilla-parse : tests/bugzilla-parse.tests.o
351+ tests/url-encode : tests/url-encode.tests.o
352+ tests/jsongen : tests/jsongen.tests.o
353+ tests/base64 : tests/base64.tests.o
354+ tests/difftests : tests/difftests.tests.o
355+
356+ $(TEST_PROGRAMS ) : libgcli.a
335357 $(CCACHE ) $(CC ) $(CFLAGS ) $(CCDEPFLAGS ) $(CPPFLAGS ) \
336358 $(LIBATFC_CFLAGS ) $(LIBCURL_CFLAGS ) $(LIBCRYPTO_CFLAGS ) \
337359 $(LDFLAGS ) -o $@ $(@:=.tests.o ) libgcli.a \
@@ -396,5 +418,19 @@ install-auto: manpages gcli
396418 $(INSTALL ) -d $(BINDIR )
397419 $(INSTALL ) -m 0755 gcli $(BINDIR )
398420 $(INSTALL ) -d $(MANDIR )
421+ $(INSTALL ) -d $(MANDIR ) /man5
422+ $(INSTALL ) -d $(MANDIR ) /man1
399423 # TODO: compress manual pages
400- $(INSTALL ) -m 644 $(MANPAGES ) $(MANDIR )
424+ for PAGE in $( MANPAGES) ; do \
425+ case $$ PAGE in \
426+ * .1) \
427+ $(INSTALL ) -m 644 $$ PAGE $(MANDIR ) /man1 \
428+ ;; \
429+ * .5) \
430+ $(INSTALL ) -m 644 $$ PAGE $(MANDIR ) /man5 \
431+ ;; \
432+ * ) \
433+ echo error installing man page $$ PAGE >&2 \
434+ ;; \
435+ esac \
436+ done
0 commit comments