Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-22 21:33:02 +01:00
Code Issues Projects Releases Wiki Activity

Fix Tox/toxic#222 and reorganize cfg dir

Browse Source
This commit is contained in:
Ansa89 2014-08-19 18:22:57 +02:00
parent affc88d0a8
commit a3a8f7608a
9 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build/Makefile
View File

@ -2,8 +2,9 @@ TOXIC_VERSION = 0.4.7
REV = $(shell git rev-list HEAD --count) REV = $(shell git rev-list HEAD --count)
VERSION = $(TOXIC_VERSION)_r$(REV) VERSION = $(TOXIC_VERSION)_r$(REV)
CFG_DIR = ../cfg BASE_DIR = $(shell cd .. && pwd -P)
SRC_DIR = ../src CFG_DIR = $(BASE_DIR)/cfg
SRC_DIR = $(BASE_DIR)/src
PREFIX = /usr/local PREFIX = /usr/local
BINDIR = $(PREFIX)/bin BINDIR = $(PREFIX)/bin
DATADIR = $(PREFIX)/share/toxic DATADIR = $(PREFIX)/share/toxic
@ -49,7 +50,7 @@ ifneq ($(filter arm%, $(UNAME_M)),)
endif endif
# Include all needed checks # Include all needed checks
-include $(CFG_DIR)/check_features.mk -include $(CFG_DIR)/checks/check_features.mk
# Targets # Targets
all: toxic all: toxic
@ -68,7 +69,6 @@ clean:
-include $(OBJ:.o=.d) -include $(OBJ:.o=.d)
-include $(CFG_DIR)/install.mk -include $(CFG_DIR)/targets/*.mk
-include $(CFG_DIR)/help.mk
.PHONY: clean all .PHONY: clean all

0
cfg/av.mk → cfg/checks/av.mk
View File

8
cfg/check_features.mk → cfg/checks/check_features.mk
View File

@ -1,3 +1,5 @@
CHECKS_DIR = $(CFG_DIR)/checks
# Check if we can use X11 # Check if we can use X11
CHECK_X11_LIBS = $(shell pkg-config x11 || echo -n "error") CHECK_X11_LIBS = $(shell pkg-config x11 || echo -n "error")
ifneq ($(CHECK_X11_LIBS), error) ifneq ($(CHECK_X11_LIBS), error)
@ -8,19 +10,19 @@ endif
# Check if we want build audio support # Check if we want build audio support
AUDIO = $(shell if [ -z "$(DISABLE_AV)" ] || [ "$(DISABLE_AV)" = "0" ] ; then echo enabled ; else echo disabled ; fi) AUDIO = $(shell if [ -z "$(DISABLE_AV)" ] || [ "$(DISABLE_AV)" = "0" ] ; then echo enabled ; else echo disabled ; fi)
ifneq ($(AUDIO), disabled) ifneq ($(AUDIO), disabled)
-include $(CFG_DIR)/av.mk -include $(CHECKS_DIR)/av.mk
endif endif
# Check if we want build sound notifications support # Check if we want build sound notifications support
SND_NOTIFY = $(shell if [ -z "$(DISABLE_SOUND_NOTIFY)" ] || [ "$(DISABLE_SOUND_NOTIFY)" = "0" ] ; then echo enabled ; else echo disabled ; fi) SND_NOTIFY = $(shell if [ -z "$(DISABLE_SOUND_NOTIFY)" ] || [ "$(DISABLE_SOUND_NOTIFY)" = "0" ] ; then echo enabled ; else echo disabled ; fi)
ifneq ($(SND_NOTIFY), disabled) ifneq ($(SND_NOTIFY), disabled)
-include $(CFG_DIR)/sound_notifications.mk -include $(CHECKS_DIR)/sound_notifications.mk
endif endif
# Check if we want build desktop notifications support # Check if we want build desktop notifications support
DESK_NOTIFY = $(shell if [ -z "$(DISABLE_DESKTOP_NOTIFY)" ] || [ "$(DISABLE_DESKTOP_NOTIFY)" = "0" ] ; then echo enabled ; else echo disabled ; fi) DESK_NOTIFY = $(shell if [ -z "$(DISABLE_DESKTOP_NOTIFY)" ] || [ "$(DISABLE_DESKTOP_NOTIFY)" = "0" ] ; then echo enabled ; else echo disabled ; fi)
ifneq ($(DESK_NOTIFY), disabled) ifneq ($(DESK_NOTIFY), disabled)
-include $(CFG_DIR)/desktop_notifications.mk -include $(CHECKS_DIR)/desktop_notifications.mk
endif endif
# Check if we can build Toxic # Check if we can build Toxic

0
cfg/desktop_notifications.mk → cfg/checks/desktop_notifications.mk
View File

0
cfg/sound_notifications.mk → cfg/checks/sound_notifications.mk
View File

1
cfg/systems/FreeBSD.mk
View File

@ -1,3 +1,4 @@
# Specials options for freebsd systems # Specials options for freebsd systems
LIBS := $(filter-out ncursesw, $(LIBS)) LIBS := $(filter-out ncursesw, $(LIBS))
LDFLAGS += -lncursesw LDFLAGS += -lncursesw
MANDIR = $(PREFIX)/man

1
cfg/systems/Linux.mk
View File

@ -1,3 +1,4 @@
# Specials options for linux systems # Specials options for linux systems
CFLAGS += CFLAGS +=
LDFLAGS += -ldl -lresolv LDFLAGS += -ldl -lresolv
MANDIR = $(PREFIX)/share/man

0
cfg/help.mk → cfg/targets/help.mk
View File

6
cfg/install.mk → cfg/targets/install.mk
View File

@ -1,6 +1,6 @@
MISC_DIR = ../misc MISC_DIR = $(BASE_DIR)/misc
DOC_DIR = ../doc DOC_DIR = $(BASE_DIR)/doc
SND_DIR = ../sounds SND_DIR = $(BASE_DIR)/sounds
DATAFILES = DHTnodes DNSservers toxic.conf.example DATAFILES = DHTnodes DNSservers toxic.conf.example
MANFILES = toxic.1 toxic.conf.5 MANFILES = toxic.1 toxic.conf.5
SNDFILES = ContactLogsIn.wav ContactLogsOut.wav Error.wav IncomingCall.wav SNDFILES = ContactLogsIn.wav ContactLogsOut.wav Error.wav IncomingCall.wav