jadedctrl/Chat-O-Matic
jadedctrl/ Chat-O-Matic
1
0
Disbranĉigi 0
Fontkodo Issues 20 Tirpetoj Actions Packages Projects Eldonoj 2 Wiki Activity

Finally cleaned up the buildsystem.

This commit is contained in:
Barrett17 2015-06-24 15:31:54 +00:00
parent 67fe224ca6
commit ae0652f3cc
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jamfile
View File

@ -8,4 +8,4 @@ SubInclude TOP smileys ;
SubInclude TOP tests ; SubInclude TOP tests ;
UninstallTarget $(CAYA_DIRECTORY) ; UninstallTarget $(CAYA_DIRECTORY) ;
UninstallTarget $(COMMON_INCLUDE_DIRECTORY)/caya ; UninstallTarget $(SYSTEM_INCLUDE_DIRECTORY)/caya ;

6
application/Jamfile
View File

@ -72,6 +72,6 @@ LINKFLAGS on Caya += -L$(EXPAT_LIBRARY_DIR) ;
InstallBin $(CAYA_DIRECTORY) : Caya ; InstallBin $(CAYA_DIRECTORY) : Caya ;
InstallFile $(COMMON_INCLUDE_DIRECTORY)/caya : CayaConstants.h ; InstallFile $(SYSTEM_INCLUDE_DIRECTORY)/caya : CayaConstants.h ;
InstallFile $(COMMON_INCLUDE_DIRECTORY)/caya : CayaProtocol.h ; InstallFile $(SYSTEM_INCLUDE_DIRECTORY)/caya : CayaProtocol.h ;
InstallFile $(COMMON_INCLUDE_DIRECTORY)/caya : CayaProtocolMessages.h ; InstallFile $(SYSTEM_INCLUDE_DIRECTORY)/caya : CayaProtocolMessages.h ;

14
configure vendored
View File

@ -1,10 +1,12 @@
#!/bin/sh #!/bin/sh
# #
# Copyright 2014-2015, Dario Casalinuovo.
# Copyright 2009, Pier Luigi Fiorini. # Copyright 2009, Pier Luigi Fiorini.
# Distributed under the terms of the MIT License. # Distributed under the terms of the MIT License.
# #
# Authors: # Authors:
# Pier Luigi Fiorini, pierluigi.fiorini@gmail.com # Pier Luigi Fiorini, pierluigi.fiorini@gmail.com
# Dario Casalinuovo
# #
current_dir=`pwd` current_dir=`pwd`
@ -122,17 +124,13 @@ MIMESET = ${mimesetbin} ;
SETVERSION = ${setversionbin} ; SETVERSION = ${setversionbin} ;
COPYATTR = ${copyattrbin} ; COPYATTR = ${copyattrbin} ;
#TODO common doesn't exists anymore, change COMMON to SYSTEM
COMMON_BIN_DIRECTORY = $(finddir B_SYSTEM_BIN_DIRECTORY) ;
COMMON_INCLUDE_DIRECTORY = $(finddir B_SYSTEM_HEADERS_DIRECTORY) ;
COMMON_LIB_DIRECTORY = $(finddir B_SYSTEM_DEVELOP_DIRECTORY)/lib ;
COMMON_SERVERS_DIRECTORY = $(finddir B_SYSTEM_SERVERS_DIRECTORY) ;
COMMON_ADDONS_DIRECTORY = $(finddir B_SYSTEM_ADDONS_DIRECTORY) ;
COMMON_DEVELOP_DIRECTORY = $(finddir B_SYSTEM_DEVELOP_DIRECTORY) ;
USER_CONFIG_DIRECTORY = $(finddir B_USER_CONFIG_DIRECTORY) ; USER_CONFIG_DIRECTORY = $(finddir B_USER_CONFIG_DIRECTORY) ;
SYSTEM_DIRECTORY = $(finddir B_SYSTEM_DIRECTORY) ; SYSTEM_DIRECTORY = $(finddir B_SYSTEM_DIRECTORY) ;
SYSTEM_BIN_DIRECTORY = $(finddir B_SYSTEM_BIN_DIRECTORY) ;
SYSTEM_SERVERS_DIRECTORY = $(finddir B_SYSTEM_SERVERS_DIRECTORY) ;
SYSTEM_ADDONS_DIRECTORY = $(finddir B_SYSTEM_ADDONS_DIRECTORY) ;
SYSTEM_DEVELOP_DIRECTORY = $(finddir B_SYSTEM_DEVELOP_DIRECTORY) ;
SYSTEM_INCLUDE_DIRECTORY = $(finddir B_SYSTEM_HEADERS_DIRECTORY) ; SYSTEM_INCLUDE_DIRECTORY = $(finddir B_SYSTEM_HEADERS_DIRECTORY) ;
SYSTEM_DEVELOP_LIB_DIRECTORY = $(finddir B_SYSTEM_DEVELOP_DIRECTORY)/lib ; SYSTEM_DEVELOP_LIB_DIRECTORY = $(finddir B_SYSTEM_DEVELOP_DIRECTORY)/lib ;
SYSTEM_LIB_DIRECTORY = $(finddir B_SYSTEM_LIB_DIRECTORY) ; SYSTEM_LIB_DIRECTORY = $(finddir B_SYSTEM_LIB_DIRECTORY) ;