Commit a9fab63
abacus_fixer
Fix Makefile build: register new sources and resolve VPATH conflicts
Makefile.Objects:
- Register the new .cpp files split in this PR in their object groups
- Fix dangling entries: xc_funct_hcth.o -> xc_hcth.o, remove
onsite_proj_pw.o, memory.o -> memory_recorder.o, dftu.o ->
dftu_lcao.o and other renamed leftovers
- Update VPATH for renamed directories (source_lcao/module_hcontainer
and module_gint moved to source_hamilt, add source_io subdirectories)
- Add an explicit symm_rho_charge.o rule target for
source_estate/module_charge/symm_rho.cpp: two symm_rho.cpp files
share the name and VPATH resolves to the source_cell one, leaving
Symmetry_rho undefined (pre-existing on develop)
- Remove the duplicate setup_dftu_pw.o from OBJS_DFTU and drop the
orphan dmr_complex.o, which no CMakeLists.txt compiles and which
duplicates a DensityMatrix::cal_DMR specialization
Makefile:
- Set .DEFAULT_GOAL to abacus and pass -f to the sub-make so the
default target actually builds instead of stopping after the first
rule (the Intel Makefile CI job has been a 0-second no-op because
the first rule only generated build_info.h)
generate_build_info.sh:
- Locate build_info.h.in relative to the script directory so the
header is generated regardless of the caller's cwd
Verified: full GNU Make build with mpicxx links successfully; ABACUS.mpi
--version reports v3.11.0-beta8; tests/01_PW/101_PW_W90 runs to
completion with results matching result.ref; CMake xc_ target still
compiles on both libxc paths.1 parent f1528c3 commit a9fab63
3 files changed
Lines changed: 148 additions & 58 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
257 | 257 | | |
258 | 258 | | |
259 | 259 | | |
260 | | - | |
| 260 | + | |
| 261 | + | |
261 | 262 | | |
262 | 263 | | |
263 | 264 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
9 | 13 | | |
10 | 14 | | |
11 | 15 | | |
| |||
252 | 256 | | |
253 | 257 | | |
254 | 258 | | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
| 264 | + | |
| 265 | + | |
| 266 | + | |
255 | 267 | | |
256 | 268 | | |
257 | 269 | | |
258 | 270 | | |
259 | 271 | | |
260 | 272 | | |
261 | | - | |
262 | | - | |
263 | | - | |
| 273 | + | |
| 274 | + | |
264 | 275 | | |
265 | 276 | | |
266 | | - | |
| 277 | + | |
267 | 278 | | |
268 | 279 | | |
269 | 280 | | |
| |||
280 | 291 | | |
281 | 292 | | |
282 | 293 | | |
283 | | - | |
| 294 | + | |
| 295 | + | |
284 | 296 | | |
285 | 297 | | |
286 | 298 | | |
| |||
0 commit comments