fixed compilation: pikotools is in src subdirectory now
This commit is contained in:
parent
aa71abd725
commit
fc24570062
|
@ -27,7 +27,7 @@ endif
|
||||||
# CXX = g++-4.8
|
# CXX = g++-4.8
|
||||||
|
|
||||||
ifndef CXXFLAGS
|
ifndef CXXFLAGS
|
||||||
CXXFLAGS = -Wall -O0 -g -fPIC -pthread -std=c++20 -I/usr/local/include -I/usr/include/postgresql -DEZC_HAS_SPECIAL_STREAM -DPT_HAS_MORM
|
CXXFLAGS = -Wall -O0 -g -fPIC -pthread -std=c++20 -I/usr/local/include -I/usr/include/postgresql -I$(GLOBAL_WORKING_DIR)/pikotools/src -I$(GLOBAL_WORKING_DIR)/morm/src -DEZC_HAS_SPECIAL_STREAM -DPT_HAS_MORM
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifndef AR
|
ifndef AR
|
||||||
|
|
|
@ -3,7 +3,7 @@ include Makefile.o.dep
|
||||||
current_path := $(shell pwd)
|
current_path := $(shell pwd)
|
||||||
global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
|
global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
|
||||||
|
|
||||||
winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools
|
winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools/src
|
||||||
|
|
||||||
|
|
||||||
all: $(o)
|
all: $(o)
|
||||||
|
|
|
@ -3,7 +3,7 @@ include Makefile.o.dep
|
||||||
current_path := $(shell pwd)
|
current_path := $(shell pwd)
|
||||||
global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
|
global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
|
||||||
|
|
||||||
winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools
|
winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools/src
|
||||||
|
|
||||||
|
|
||||||
all: $(o)
|
all: $(o)
|
||||||
|
|
|
@ -3,7 +3,7 @@ include Makefile.o.dep
|
||||||
current_path := $(shell pwd)
|
current_path := $(shell pwd)
|
||||||
global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
|
global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
|
||||||
|
|
||||||
winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools
|
winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools/src
|
||||||
|
|
||||||
|
|
||||||
all: $(o)
|
all: $(o)
|
||||||
|
|
|
@ -3,7 +3,7 @@ include Makefile.o.dep
|
||||||
current_path := $(shell pwd)
|
current_path := $(shell pwd)
|
||||||
global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
|
global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
|
||||||
|
|
||||||
winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools
|
winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools/src
|
||||||
|
|
||||||
|
|
||||||
all: $(o)
|
all: $(o)
|
||||||
|
|
|
@ -3,7 +3,7 @@ include Makefile.o.dep
|
||||||
current_path := $(shell pwd)
|
current_path := $(shell pwd)
|
||||||
global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
|
global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
|
||||||
|
|
||||||
winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools
|
winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools/src
|
||||||
|
|
||||||
|
|
||||||
all: $(o)
|
all: $(o)
|
||||||
|
|
|
@ -3,7 +3,7 @@ include Makefile.o.dep
|
||||||
current_path := $(shell pwd)
|
current_path := $(shell pwd)
|
||||||
global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
|
global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
|
||||||
|
|
||||||
winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools
|
winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools/src
|
||||||
|
|
||||||
|
|
||||||
all: $(o)
|
all: $(o)
|
||||||
|
|
|
@ -3,7 +3,7 @@ include Makefile.o.dep
|
||||||
current_path := $(shell pwd)
|
current_path := $(shell pwd)
|
||||||
global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
|
global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
|
||||||
|
|
||||||
winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools
|
winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools/src
|
||||||
|
|
||||||
name = export.so
|
name = export.so
|
||||||
|
|
||||||
|
@ -31,5 +31,5 @@ clean:
|
||||||
rm -f *.o
|
rm -f *.o
|
||||||
rm -f *.so
|
rm -f *.so
|
||||||
rm -f $(name)
|
rm -f $(name)
|
||||||
|
|
||||||
include Makefile.dep
|
include Makefile.dep
|
||||||
|
|
|
@ -3,7 +3,7 @@ include Makefile.o.dep
|
||||||
current_path := $(shell pwd)
|
current_path := $(shell pwd)
|
||||||
global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
|
global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
|
||||||
|
|
||||||
winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools
|
winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools/src
|
||||||
|
|
||||||
name = gallery.so
|
name = gallery.so
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@ $(name): $(o)
|
||||||
$(CXX) -shared -Wl,-soname,$(name) -o $(name) $(CXXFLAGS) $(winix_include_paths) $(LDFLAGS) *.o
|
$(CXX) -shared -Wl,-soname,$(name) -o $(name) $(CXXFLAGS) $(winix_include_paths) $(LDFLAGS) *.o
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
%.o: %.cpp
|
%.o: %.cpp
|
||||||
$(CXX) -c $(CXXFLAGS) $(winix_include_paths) $<
|
$(CXX) -c $(CXXFLAGS) $(winix_include_paths) $<
|
||||||
|
|
||||||
|
@ -29,5 +29,5 @@ clean:
|
||||||
rm -f *.o
|
rm -f *.o
|
||||||
rm -f *.so
|
rm -f *.so
|
||||||
rm -f $(name)
|
rm -f $(name)
|
||||||
|
|
||||||
include Makefile.dep
|
include Makefile.dep
|
||||||
|
|
|
@ -3,7 +3,7 @@ include Makefile.o.dep
|
||||||
current_path := $(shell pwd)
|
current_path := $(shell pwd)
|
||||||
global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
|
global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
|
||||||
|
|
||||||
winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools
|
winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools/src
|
||||||
|
|
||||||
name = group.so
|
name = group.so
|
||||||
|
|
||||||
|
@ -29,5 +29,5 @@ clean:
|
||||||
rm -f *.o
|
rm -f *.o
|
||||||
rm -f *.so
|
rm -f *.so
|
||||||
rm -f $(name)
|
rm -f $(name)
|
||||||
|
|
||||||
include Makefile.dep
|
include Makefile.dep
|
||||||
|
|
|
@ -3,7 +3,7 @@ include Makefile.o.dep
|
||||||
current_path := $(shell pwd)
|
current_path := $(shell pwd)
|
||||||
global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
|
global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
|
||||||
|
|
||||||
winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools
|
winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools/src
|
||||||
|
|
||||||
name = mailregister.so
|
name = mailregister.so
|
||||||
|
|
||||||
|
@ -30,5 +30,5 @@ clean:
|
||||||
rm -f *.o
|
rm -f *.o
|
||||||
rm -f *.so
|
rm -f *.so
|
||||||
rm -f $(name)
|
rm -f $(name)
|
||||||
|
|
||||||
include Makefile.dep
|
include Makefile.dep
|
||||||
|
|
|
@ -3,7 +3,7 @@ include Makefile.o.dep
|
||||||
current_path := $(shell pwd)
|
current_path := $(shell pwd)
|
||||||
global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
|
global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
|
||||||
|
|
||||||
winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools
|
winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools/src
|
||||||
|
|
||||||
name = menu.so
|
name = menu.so
|
||||||
|
|
||||||
|
@ -29,5 +29,5 @@ clean:
|
||||||
rm -f *.o
|
rm -f *.o
|
||||||
rm -f *.so
|
rm -f *.so
|
||||||
rm -f $(name)
|
rm -f $(name)
|
||||||
|
|
||||||
include Makefile.dep
|
include Makefile.dep
|
||||||
|
|
|
@ -3,7 +3,7 @@ include Makefile.o.dep
|
||||||
current_path := $(shell pwd)
|
current_path := $(shell pwd)
|
||||||
global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
|
global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
|
||||||
|
|
||||||
winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools
|
winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools/src
|
||||||
|
|
||||||
name = seo.so
|
name = seo.so
|
||||||
|
|
||||||
|
@ -29,5 +29,5 @@ clean:
|
||||||
rm -f *.o
|
rm -f *.o
|
||||||
rm -f *.so
|
rm -f *.so
|
||||||
rm -f $(name)
|
rm -f $(name)
|
||||||
|
|
||||||
include Makefile.dep
|
include Makefile.dep
|
||||||
|
|
|
@ -3,7 +3,7 @@ include Makefile.o.dep
|
||||||
current_path := $(shell pwd)
|
current_path := $(shell pwd)
|
||||||
global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
|
global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
|
||||||
|
|
||||||
winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools
|
winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools/src
|
||||||
|
|
||||||
name = stats.so
|
name = stats.so
|
||||||
|
|
||||||
|
@ -29,5 +29,5 @@ clean:
|
||||||
rm -f *.o
|
rm -f *.o
|
||||||
rm -f *.so
|
rm -f *.so
|
||||||
rm -f $(name)
|
rm -f $(name)
|
||||||
|
|
||||||
include Makefile.dep
|
include Makefile.dep
|
||||||
|
|
|
@ -3,7 +3,7 @@ include Makefile.o.dep
|
||||||
current_path := $(shell pwd)
|
current_path := $(shell pwd)
|
||||||
global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
|
global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
|
||||||
|
|
||||||
winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools
|
winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools/src
|
||||||
|
|
||||||
name = thread.so
|
name = thread.so
|
||||||
|
|
||||||
|
@ -29,5 +29,5 @@ clean:
|
||||||
rm -f *.o
|
rm -f *.o
|
||||||
rm -f *.so
|
rm -f *.so
|
||||||
rm -f $(name)
|
rm -f $(name)
|
||||||
|
|
||||||
include Makefile.dep
|
include Makefile.dep
|
||||||
|
|
|
@ -3,7 +3,7 @@ include Makefile.o.dep
|
||||||
current_path := $(shell pwd)
|
current_path := $(shell pwd)
|
||||||
global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
|
global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
|
||||||
|
|
||||||
winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools
|
winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools/src
|
||||||
|
|
||||||
name = ticket.so
|
name = ticket.so
|
||||||
|
|
||||||
|
@ -29,5 +29,5 @@ clean:
|
||||||
rm -f *.o
|
rm -f *.o
|
||||||
rm -f *.so
|
rm -f *.so
|
||||||
rm -f $(name)
|
rm -f $(name)
|
||||||
|
|
||||||
include Makefile.dep
|
include Makefile.dep
|
||||||
|
|
|
@ -3,7 +3,7 @@ include Makefile.o.dep
|
||||||
current_path := $(shell pwd)
|
current_path := $(shell pwd)
|
||||||
global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
|
global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
|
||||||
|
|
||||||
winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools
|
winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools/src
|
||||||
|
|
||||||
|
|
||||||
all: $(o)
|
all: $(o)
|
||||||
|
|
Loading…
Reference in New Issue