Makefile: source files from pikotools are now in pikotools/src
This commit is contained in:
parent
f1af7e2eeb
commit
685b3ca5ee
|
@ -27,14 +27,14 @@ 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
|
CXXFLAGS = -Wall -O0 -g -fPIC -pthread -std=c++20 -I/usr/local/include -I/usr/include/postgresql -DEZC_HAS_SPECIAL_STREAM -DPT_HAS_MORM
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifndef AR
|
ifndef AR
|
||||||
AR = ar
|
AR = ar
|
||||||
endif
|
endif
|
||||||
|
|
||||||
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
|
||||||
|
|
||||||
ifndef LDFLAGS
|
ifndef LDFLAGS
|
||||||
LDFLAGS = -L/usr/local/lib
|
LDFLAGS = -L/usr/local/lib
|
||||||
|
@ -70,7 +70,7 @@ winix.so: $(winix.src.files)
|
||||||
@cd $(GLOBAL_WORKING_DIR)/tito/src ; $(MAKE) -e
|
@cd $(GLOBAL_WORKING_DIR)/tito/src ; $(MAKE) -e
|
||||||
@cd $(GLOBAL_WORKING_DIR)/pikotools ; $(MAKE) -e
|
@cd $(GLOBAL_WORKING_DIR)/pikotools ; $(MAKE) -e
|
||||||
@cd $(GLOBAL_WORKING_DIR)/morm/src ; $(MAKE) -e
|
@cd $(GLOBAL_WORKING_DIR)/morm/src ; $(MAKE) -e
|
||||||
$(CXX) -shared -rdynamic -Wl,-whole-archive -o winix.so $(CXXFLAGS) $(winix_include_paths) core/*.o db/*.o models/*.o functions/*.o templates/*.o notify/*.o $(GLOBAL_WORKING_DIR)/ezc/src/ezc.a $(GLOBAL_WORKING_DIR)/tito/src/tito.a $(GLOBAL_WORKING_DIR)/pikotools/pikotools.a $(GLOBAL_WORKING_DIR)/morm/src/morm.a $(LDFLAGS) -lfcgi -lpq -lz -lpthread -lcurl -Wl,-no-whole-archive
|
$(CXX) -shared -rdynamic -Wl,-whole-archive -o winix.so $(CXXFLAGS) $(winix_include_paths) core/*.o db/*.o models/*.o functions/*.o templates/*.o notify/*.o $(GLOBAL_WORKING_DIR)/ezc/src/ezc.a $(GLOBAL_WORKING_DIR)/tito/src/tito.a $(GLOBAL_WORKING_DIR)/pikotools/src/pikotools.a $(GLOBAL_WORKING_DIR)/morm/src/morm.a $(LDFLAGS) -lfcgi -lpq -lz -lpthread -lcurl -Wl,-no-whole-archive
|
||||||
|
|
||||||
|
|
||||||
winix: winix.so $(winix.src.files)
|
winix: winix.so $(winix.src.files)
|
||||||
|
@ -147,7 +147,7 @@ depend:
|
||||||
# use $(global_relative_working_dir) here to put relative paths to Makefile.dep
|
# use $(global_relative_working_dir) here to put relative paths to Makefile.dep
|
||||||
find -E $(global_relative_working_dir)/ezc/src -type f -regex ".*\.h|.*\.cpp" | xargs -I foo echo -n foo " " >> Makefile.dep
|
find -E $(global_relative_working_dir)/ezc/src -type f -regex ".*\.h|.*\.cpp" | xargs -I foo echo -n foo " " >> Makefile.dep
|
||||||
find -E $(global_relative_working_dir)/tito/src -type f -regex ".*\.h|.*\.cpp" | xargs -I foo echo -n foo " " >> Makefile.dep
|
find -E $(global_relative_working_dir)/tito/src -type f -regex ".*\.h|.*\.cpp" | xargs -I foo echo -n foo " " >> Makefile.dep
|
||||||
find -E $(global_relative_working_dir)/pikotools -type f -regex ".*\.h|.*\.cpp" | xargs -I foo echo -n foo " " >> Makefile.dep
|
find -E $(global_relative_working_dir)/pikotools/src -type f -regex ".*\.h|.*\.cpp" | xargs -I foo echo -n foo " " >> Makefile.dep
|
||||||
find -E $(global_relative_working_dir)/morm/src -type f -regex ".*\.h|.*\.cpp" | xargs -I foo echo -n foo " " >> Makefile.dep
|
find -E $(global_relative_working_dir)/morm/src -type f -regex ".*\.h|.*\.cpp" | xargs -I foo echo -n foo " " >> Makefile.dep
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue