@@ -41,7 +41,7 @@ eventsheaderdir = $(includedir)/janus/events
4141eventsheader_HEADERS = events/eventhandler.h
4242
4343confdir = $(sysconfdir ) /janus
44- conf_DATA = conf/janus.cfg .sample
44+ conf_DATA = conf/janus.jcfg .sample
4545
4646certdir = $(datadir ) /janus/certs
4747dist_cert_DATA = certs/mycert.key certs/mycert.pem
@@ -91,8 +91,8 @@ jsmodules_DATA = html/janus.js
9191 s| [@]duktapedir[@]| $(duktapedir ) | " \
9292 $< > $@ || rm $@
9393
94- EXTRA_DIST += conf/janus.cfg .sample.in
95- CLEANFILES += conf/janus.cfg .sample
94+ EXTRA_DIST += conf/janus.jcfg .sample.in
95+ CLEANFILES += conf/janus.jcfg .sample
9696
9797# #
9898# Janus
@@ -170,6 +170,28 @@ janus_LDADD = \
170170
171171dist_man1_MANS = janus.1
172172
173+ bin_PROGRAMS += janus-cfgconv
174+
175+ janus_cfgconv_SOURCES = \
176+ janus-cfgconv.c \
177+ config.c \
178+ log.c \
179+ utils.c \
180+ version.c \
181+ $(NULL )
182+
183+ janus_cfgconv_CFLAGS = \
184+ $(AM_CFLAGS ) \
185+ $(JANUS_CFLAGS ) \
186+ $(NULL )
187+
188+ janus_cfgconv_LDADD = \
189+ $(JANUS_LIBS ) \
190+ $(JANUS_MANUAL_LIBS ) \
191+ $(NULL )
192+
193+ dist_man1_MANS += janus-cfgconv.1
194+
173195BUILT_SOURCES = cmdline.c cmdline.h version.c
174196
175197cmdline.h : cmdline.c
@@ -224,9 +246,9 @@ transports_libjanus_http_la_SOURCES = transports/janus_http.c
224246transports_libjanus_http_la_CFLAGS = $(transports_cflags ) $(MHD_CFLAGS )
225247transports_libjanus_http_la_LDFLAGS = $(transports_ldflags ) $(MHD_LDFLAGS ) $(MHD_LIBS )
226248transports_libjanus_http_la_LIBADD = $(transports_libadd ) $(MHD_LDFLAGS )
227- conf_DATA += conf/janus.transport.http.cfg .sample
228- EXTRA_DIST += conf/janus.transport.http.cfg .sample.in
229- CLEANFILES += conf/janus.transport.http.cfg .sample
249+ conf_DATA += conf/janus.transport.http.jcfg .sample
250+ EXTRA_DIST += conf/janus.transport.http.jcfg .sample.in
251+ CLEANFILES += conf/janus.transport.http.jcfg .sample
230252endif
231253
232254if ENABLE_WEBSOCKETS
@@ -235,9 +257,9 @@ transports_libjanus_websockets_la_SOURCES = transports/janus_websockets.c
235257transports_libjanus_websockets_la_CFLAGS = $(transports_cflags )
236258transports_libjanus_websockets_la_LDFLAGS = $(transports_ldflags ) $(WS_MANUAL_LIBS )
237259transports_libjanus_websockets_la_LIBADD = $(transports_libadd )
238- conf_DATA += conf/janus.transport.websockets.cfg .sample
239- EXTRA_DIST += conf/janus.transport.websockets.cfg .sample.in
240- CLEANFILES += conf/janus.transport.websockets.cfg .sample
260+ conf_DATA += conf/janus.transport.websockets.jcfg .sample
261+ EXTRA_DIST += conf/janus.transport.websockets.jcfg .sample.in
262+ CLEANFILES += conf/janus.transport.websockets.jcfg .sample
241263endif
242264
243265if ENABLE_RABBITMQ
@@ -246,8 +268,8 @@ transports_libjanus_rabbitmq_la_SOURCES = transports/janus_rabbitmq.c
246268transports_libjanus_rabbitmq_la_CFLAGS = $(transports_cflags )
247269transports_libjanus_rabbitmq_la_LDFLAGS = $(transports_ldflags ) -lrabbitmq
248270transports_libjanus_rabbitmq_la_LIBADD = $(transports_libadd )
249- conf_DATA += conf/janus.transport.rabbitmq.cfg .sample
250- EXTRA_DIST += conf/janus.transport.rabbitmq.cfg .sample
271+ conf_DATA += conf/janus.transport.rabbitmq.jcfg .sample
272+ EXTRA_DIST += conf/janus.transport.rabbitmq.jcfg .sample
251273endif
252274
253275if ENABLE_MQTT
@@ -256,8 +278,8 @@ transports_libjanus_mqtt_la_SOURCES = transports/janus_mqtt.c
256278transports_libjanus_mqtt_la_CFLAGS = $(transports_cflags )
257279transports_libjanus_mqtt_la_LDFLAGS = $(transports_ldflags ) -lpaho-mqtt3as
258280transports_libjanus_mqtt_la_LIBADD = $(transports_libadd )
259- conf_DATA += conf/janus.transport.mqtt.cfg .sample
260- EXTRA_DIST += conf/janus.transport.mqtt.cfg .sample
281+ conf_DATA += conf/janus.transport.mqtt.jcfg .sample
282+ EXTRA_DIST += conf/janus.transport.mqtt.jcfg .sample
261283endif
262284
263285if ENABLE_PFUNIX
@@ -266,8 +288,8 @@ transports_libjanus_pfunix_la_SOURCES = transports/janus_pfunix.c
266288transports_libjanus_pfunix_la_CFLAGS = $(transports_cflags )
267289transports_libjanus_pfunix_la_LDFLAGS = $(transports_ldflags ) $(LIBSYSTEMD_LIBS )
268290transports_libjanus_pfunix_la_LIBADD = $(transports_libadd )
269- conf_DATA += conf/janus.transport.pfunix.cfg .sample
270- EXTRA_DIST += conf/janus.transport.pfunix.cfg .sample
291+ conf_DATA += conf/janus.transport.pfunix.jcfg .sample
292+ EXTRA_DIST += conf/janus.transport.pfunix.jcfg .sample
271293endif
272294
273295if ENABLE_NANOMSG
@@ -276,8 +298,8 @@ transports_libjanus_nanomsg_la_SOURCES = transports/janus_nanomsg.c
276298transports_libjanus_nanomsg_la_CFLAGS = $(transports_cflags )
277299transports_libjanus_nanomsg_la_LDFLAGS = $(transports_ldflags ) -lnanomsg
278300transports_libjanus_nanomsg_la_LIBADD = $(transports_libadd )
279- conf_DATA += conf/janus.transport.nanomsg.cfg .sample
280- EXTRA_DIST += conf/janus.transport.nanomsg.cfg .sample
301+ conf_DATA += conf/janus.transport.nanomsg.jcfg .sample
302+ EXTRA_DIST += conf/janus.transport.nanomsg.jcfg .sample
281303endif
282304
283305# #
@@ -299,8 +321,8 @@ events_libjanus_sampleevh_la_SOURCES = events/janus_sampleevh.c
299321events_libjanus_sampleevh_la_CFLAGS = $(events_cflags )
300322events_libjanus_sampleevh_la_LDFLAGS = $(events_ldflags ) -lcurl
301323events_libjanus_sampleevh_la_LIBADD = $(events_libadd )
302- conf_DATA += conf/janus.eventhandler.sampleevh.cfg .sample
303- EXTRA_DIST += conf/janus.eventhandler.sampleevh.cfg .sample
324+ conf_DATA += conf/janus.eventhandler.sampleevh.jcfg .sample
325+ EXTRA_DIST += conf/janus.eventhandler.sampleevh.jcfg .sample
304326endif
305327
306328if ENABLE_RABBITMQEVH
@@ -309,8 +331,8 @@ events_libjanus_rabbitmqevh_la_SOURCES = events/janus_rabbitmqevh.c
309331events_libjanus_rabbitmqevh_la_CFLAGS = $(events_cflags )
310332events_libjanus_rabbitmqevh_la_LDFLAGS = $(events_ldflags ) -lrabbitmq
311333events_libjanus_rabbitmqevh_la_LIBADD = $(events_libadd )
312- conf_DATA += conf/janus.eventhandler.rabbitmqevh.cfg .sample
313- EXTRA_DIST += conf/janus.eventhandler.rabbitmqevh.cfg .sample
334+ conf_DATA += conf/janus.eventhandler.rabbitmqevh.jcfg .sample
335+ EXTRA_DIST += conf/janus.eventhandler.rabbitmqevh.jcfg .sample
314336endif
315337
316338if ENABLE_MQTTEVH
@@ -342,8 +364,8 @@ plugins_libjanus_audiobridge_la_SOURCES = plugins/janus_audiobridge.c
342364plugins_libjanus_audiobridge_la_CFLAGS = $(plugins_cflags ) $(OPUS_CFLAGS )
343365plugins_libjanus_audiobridge_la_LDFLAGS = $(plugins_ldflags ) $(OPUS_LDFLAGS ) $(OPUS_LIBS )
344366plugins_libjanus_audiobridge_la_LIBADD = $(plugins_libadd ) $(OPUS_LIBADD )
345- conf_DATA += conf/janus.plugin.audiobridge.cfg .sample
346- EXTRA_DIST += conf/janus.plugin.audiobridge.cfg .sample
367+ conf_DATA += conf/janus.plugin.audiobridge.jcfg .sample
368+ EXTRA_DIST += conf/janus.plugin.audiobridge.jcfg .sample
347369endif
348370
349371if ENABLE_PLUGIN_ECHOTEST
@@ -352,8 +374,8 @@ plugins_libjanus_echotest_la_SOURCES = plugins/janus_echotest.c
352374plugins_libjanus_echotest_la_CFLAGS = $(plugins_cflags )
353375plugins_libjanus_echotest_la_LDFLAGS = $(plugins_ldflags )
354376plugins_libjanus_echotest_la_LIBADD = $(plugins_libadd )
355- conf_DATA += conf/janus.plugin.echotest.cfg .sample
356- EXTRA_DIST += conf/janus.plugin.echotest.cfg .sample
377+ conf_DATA += conf/janus.plugin.echotest.jcfg .sample
378+ EXTRA_DIST += conf/janus.plugin.echotest.jcfg .sample
357379endif
358380
359381if ENABLE_PLUGIN_RECORDPLAY
@@ -362,15 +384,15 @@ plugins_libjanus_recordplay_la_SOURCES = plugins/janus_recordplay.c
362384plugins_libjanus_recordplay_la_CFLAGS = $(plugins_cflags )
363385plugins_libjanus_recordplay_la_LDFLAGS = $(plugins_ldflags )
364386plugins_libjanus_recordplay_la_LIBADD = $(plugins_libadd )
365- conf_DATA += conf/janus.plugin.recordplay.cfg .sample
387+ conf_DATA += conf/janus.plugin.recordplay.jcfg .sample
366388recordings_DATA += \
367389 plugins/recordings/1234.nfo \
368390 plugins/recordings/rec-sample-audio.mjr \
369391 plugins/recordings/rec-sample-video.mjr
370392EXTRA_DIST += \
371- conf/janus.plugin.recordplay.cfg .sample.in \
393+ conf/janus.plugin.recordplay.jcfg .sample.in \
372394 $(recordings_DATA )
373- CLEANFILES += conf/janus.plugin.recordplay.cfg .sample
395+ CLEANFILES += conf/janus.plugin.recordplay.jcfg .sample
374396endif
375397
376398if ENABLE_PLUGIN_SIP
@@ -379,8 +401,8 @@ plugins_libjanus_sip_la_SOURCES = plugins/janus_sip.c
379401plugins_libjanus_sip_la_CFLAGS = $(plugins_cflags ) $(SOFIA_CFLAGS )
380402plugins_libjanus_sip_la_LDFLAGS = $(plugins_ldflags ) $(SOFIA_LDFLAGS ) $(SOFIA_LIBS )
381403plugins_libjanus_sip_la_LIBADD = $(plugins_libadd ) $(SOFIA_LIBADD )
382- conf_DATA += conf/janus.plugin.sip.cfg .sample
383- EXTRA_DIST += conf/janus.plugin.sip.cfg .sample
404+ conf_DATA += conf/janus.plugin.sip.jcfg .sample
405+ EXTRA_DIST += conf/janus.plugin.sip.jcfg .sample
384406endif
385407
386408if ENABLE_PLUGIN_SIPRE
@@ -389,8 +411,8 @@ plugins_libjanus_sipre_la_SOURCES = plugins/janus_sipre.c
389411plugins_libjanus_sipre_la_CFLAGS = $(plugins_cflags ) $(LIBRE_CFLAGS )
390412plugins_libjanus_sipre_la_LDFLAGS = $(plugins_ldflags ) $(LIBRE_LDFLAGS ) $(LIBRE_LIBS )
391413plugins_libjanus_sipre_la_LIBADD = $(plugins_libadd ) $(LIBRE_LIBADD )
392- conf_DATA += conf/janus.plugin.sipre.cfg .sample
393- EXTRA_DIST += conf/janus.plugin.sipre.cfg .sample
414+ conf_DATA += conf/janus.plugin.sipre.jcfg .sample
415+ EXTRA_DIST += conf/janus.plugin.sipre.jcfg .sample
394416endif
395417
396418if ENABLE_PLUGIN_NOSIP
@@ -399,8 +421,8 @@ plugins_libjanus_nosip_la_SOURCES = plugins/janus_nosip.c
399421plugins_libjanus_nosip_la_CFLAGS = $(plugins_cflags )
400422plugins_libjanus_nosip_la_LDFLAGS = $(plugins_ldflags )
401423plugins_libjanus_nosip_la_LIBADD = $(plugins_libadd )
402- conf_DATA += conf/janus.plugin.nosip.cfg .sample
403- EXTRA_DIST += conf/janus.plugin.nosip.cfg .sample
424+ conf_DATA += conf/janus.plugin.nosip.jcfg .sample
425+ EXTRA_DIST += conf/janus.plugin.nosip.jcfg .sample
404426endif
405427
406428if ENABLE_PLUGIN_STREAMING
@@ -409,16 +431,16 @@ plugins_libjanus_streaming_la_SOURCES = plugins/janus_streaming.c
409431plugins_libjanus_streaming_la_CFLAGS = $(plugins_cflags )
410432plugins_libjanus_streaming_la_LDFLAGS = $(plugins_ldflags )
411433plugins_libjanus_streaming_la_LIBADD = $(plugins_libadd )
412- conf_DATA += conf/janus.plugin.streaming.cfg .sample
434+ conf_DATA += conf/janus.plugin.streaming.jcfg .sample
413435stream_DATA += \
414436 plugins/streams/music.mulaw \
415437 plugins/streams/radio.alaw \
416438 plugins/streams/test_gstreamer.sh \
417439 plugins/streams/test_gstreamer_1.sh
418440EXTRA_DIST += \
419- conf/janus.plugin.streaming.cfg .sample.in \
441+ conf/janus.plugin.streaming.jcfg .sample.in \
420442 $(stream_DATA )
421- CLEANFILES += conf/janus.plugin.streaming.cfg .sample
443+ CLEANFILES += conf/janus.plugin.streaming.jcfg .sample
422444endif
423445
424446if ENABLE_PLUGIN_VIDEOCALL
@@ -427,8 +449,8 @@ plugins_libjanus_videocall_la_SOURCES = plugins/janus_videocall.c
427449plugins_libjanus_videocall_la_CFLAGS = $(plugins_cflags )
428450plugins_libjanus_videocall_la_LDFLAGS = $(plugins_ldflags )
429451plugins_libjanus_videocall_la_LIBADD = $(plugins_libadd )
430- conf_DATA += conf/janus.plugin.videocall.cfg .sample
431- EXTRA_DIST += conf/janus.plugin.videocall.cfg .sample
452+ conf_DATA += conf/janus.plugin.videocall.jcfg .sample
453+ EXTRA_DIST += conf/janus.plugin.videocall.jcfg .sample
432454endif
433455
434456if ENABLE_PLUGIN_VIDEOROOM
@@ -437,8 +459,8 @@ plugins_libjanus_videoroom_la_SOURCES = plugins/janus_videoroom.c
437459plugins_libjanus_videoroom_la_CFLAGS = $(plugins_cflags )
438460plugins_libjanus_videoroom_la_LDFLAGS = $(plugins_ldflags )
439461plugins_libjanus_videoroom_la_LIBADD = $(plugins_libadd )
440- conf_DATA += conf/janus.plugin.videoroom.cfg .sample
441- EXTRA_DIST += conf/janus.plugin.videoroom.cfg .sample
462+ conf_DATA += conf/janus.plugin.videoroom.jcfg .sample
463+ EXTRA_DIST += conf/janus.plugin.videoroom.jcfg .sample
442464endif
443465
444466if ENABLE_PLUGIN_VOICEMAIL
@@ -447,9 +469,9 @@ plugins_libjanus_voicemail_la_SOURCES = plugins/janus_voicemail.c
447469plugins_libjanus_voicemail_la_CFLAGS = $(plugins_cflags )
448470plugins_libjanus_voicemail_la_LDFLAGS = $(plugins_ldflags ) -logg
449471plugins_libjanus_voicemail_la_LIBADD = $(plugins_libadd )
450- conf_DATA += conf/janus.plugin.voicemail.cfg .sample
451- EXTRA_DIST += conf/janus.plugin.voicemail.cfg .sample.in
452- CLEANFILES += conf/janus.plugin.voicemail.cfg .sample
472+ conf_DATA += conf/janus.plugin.voicemail.jcfg .sample
473+ EXTRA_DIST += conf/janus.plugin.voicemail.jcfg .sample.in
474+ CLEANFILES += conf/janus.plugin.voicemail.jcfg .sample
453475endif
454476
455477if ENABLE_PLUGIN_TEXTROOM
@@ -458,8 +480,8 @@ plugins_libjanus_textroom_la_SOURCES = plugins/janus_textroom.c
458480plugins_libjanus_textroom_la_CFLAGS = $(plugins_cflags )
459481plugins_libjanus_textroom_la_LDFLAGS = $(plugins_ldflags )
460482plugins_libjanus_textroom_la_LIBADD = $(plugins_libadd )
461- conf_DATA += conf/janus.plugin.textroom.cfg .sample
462- EXTRA_DIST += conf/janus.plugin.textroom.cfg .sample
483+ conf_DATA += conf/janus.plugin.textroom.jcfg .sample
484+ EXTRA_DIST += conf/janus.plugin.textroom.jcfg .sample
463485endif
464486
465487if ENABLE_PLUGIN_LUA
@@ -468,13 +490,13 @@ plugins_libjanus_lua_la_SOURCES = plugins/janus_lua.c plugins/janus_lua_data.h p
468490plugins_libjanus_lua_la_CFLAGS = $(plugins_cflags ) $(LUA_CFLAGS )
469491plugins_libjanus_lua_la_LDFLAGS = $(plugins_ldflags ) $(LUA_LDFLAGS ) $(LUA_LIBS )
470492plugins_libjanus_lua_la_LIBADD = $(plugins_libadd ) $(LUA_LIBADD )
471- conf_DATA += conf/janus.plugin.lua.cfg .sample
493+ conf_DATA += conf/janus.plugin.lua.jcfg .sample
472494lua_DATA += \
473495 plugins/lua/echotest.lua \
474496 plugins/lua/videoroom.lua \
475497 plugins/lua/janus-logger.lua \
476498 plugins/lua/janus-sdp.lua
477- EXTRA_DIST += conf/janus.plugin.lua.cfg .sample.in
499+ EXTRA_DIST += conf/janus.plugin.lua.jcfg .sample.in
478500endif
479501
480502if ENABLE_PLUGIN_DUKTAPE
@@ -487,11 +509,11 @@ plugins_libjanus_duktape_la_SOURCES = plugins/janus_duktape.c \
487509plugins_libjanus_duktape_la_CFLAGS = $(plugins_cflags ) $(DUKTAPE_CFLAGS )
488510plugins_libjanus_duktape_la_LDFLAGS = $(plugins_ldflags ) $(DUKTAPE_LDFLAGS ) $(DUKTAPE_LIBS )
489511plugins_libjanus_duktape_la_LIBADD = $(plugins_libadd ) $(DUKTAPE_LIBADD )
490- conf_DATA += conf/janus.plugin.duktape.cfg .sample
512+ conf_DATA += conf/janus.plugin.duktape.jcfg .sample
491513duktape_DATA += \
492514 plugins/duktape/echotest.js \
493515 plugins/duktape/janus-sdp.js
494- EXTRA_DIST += conf/janus.plugin.duktape.cfg .sample.in
516+ EXTRA_DIST += conf/janus.plugin.duktape.jcfg .sample.in
495517endif
496518
497519
0 commit comments