use PT_HAS_MORM_LIBRARY macro when building too

while here:
- use some conditionals in the Makefile
This commit is contained in:
Tomasz Sowa 2022-09-23 18:33:06 +02:00
parent baa870edbd
commit 03035f038f
2 changed files with 27 additions and 5 deletions

View File

@ -3,14 +3,37 @@ objfiles:=$(patsubst %.cpp,%.o,$(sourcefiles))
GLOBAL_WORKING_DIR := $(shell pwd)/../../..
CXX = g++10
CXXFLAGS = -Wall -pedantic -O0 -g -std=c++20 -I$(GLOBAL_WORKING_DIR)/pikotools/src -I$(GLOBAL_WORKING_DIR)/ezc/src -I$(GLOBAL_WORKING_DIR)/morm/src -I/usr/local/include -DEZC_HAS_MORM_LIBRARY -DMORM_HAS_EZC_LIBRARY
LDFLAGS = -L/usr/local/lib
WINIX_NEEDED_MACROS = -DPT_HAS_MORM_LIBRARY \
-DEZC_HAS_MORM_LIBRARY \
-DMORM_HAS_EZC_LIBRARY
ifndef CXX
CXX = g++
endif
ifndef CXXFLAGS
CXXFLAGS = -Wall -pedantic -O2 -std=c++20 \
-I/usr/local/include \
-I$(GLOBAL_WORKING_DIR)/winix/winixcli \
-I$(GLOBAL_WORKING_DIR)/pikotools/src \
-I$(GLOBAL_WORKING_DIR)/morm/src \
-I$(GLOBAL_WORKING_DIR)/ezc/src \
-I$(GLOBAL_WORKING_DIR)/tito/src \
$(WINIX_NEEDED_MACROS)
endif
ifndef LDFLAGS
LDFLAGS = -L/usr/local/lib -s
endif
export CXX
export CXXFLAGS
export LDFLAGS
export WINIX_NEEDED_MACROS
progname = winix
@ -51,7 +74,7 @@ clean:
depend:
makedepend -Y. -f- $(sourcefiles) > Makefile.dep
makedepend -Y. -I../../../pikotools/src -I../../../morm/src -I../../../ezc/src -I../../../tito/src $(WINIX_NEEDED_MACROS) -f- $(sourcefiles) > Makefile.dep
-include Makefile.dep

View File

@ -34,7 +34,6 @@ endif
ifndef CXXFLAGS
CXXFLAGS = -Wall -pedantic -O2 -std=c++20 -fPIC -pthread \
-I/usr/local/include \
-I/usr/include/postgresql \
-I../../winix/winixd \
-I../../pikotools/src \
-I../../morm/src \