Skip to content

Commit

Permalink
More build issues
Browse files Browse the repository at this point in the history
  • Loading branch information
JanWielemaker committed Jul 26, 2024
1 parent 95f556a commit f6a5f74
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 10 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ status.db
*.hdt
*.hdt.index*
*.nt
.hdt-cpp-sentinel
13 changes: 3 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@ CXXFLAGS=$(SWIPL_CFLAGS) -I$(LIBHDT)/include -std=c++17 $(COFLAGS)
# LIBS= -L$(HDTLIB) -L$(CDSLIB) -lhdt -lcds
# Instead, we copy the *.a files into the same directory as $(OBJ)
# - see the rules for $(OBJ2).
LIBS= -Lc -lhdt -lcds
OBJ= c/hdt4pl.o
OBJ2= c/libcds.a c/libhdt.a
LIBS= $(HDTLIB)/libhdt.a $(CDSLIB)/libcds.a
# WARNING: A previous version of this Makefile set LD=g++
# ... this confuses hdt-cpp's use of libtool.
# The correct way of using the linker is with $(CC):
Expand All @@ -30,15 +29,9 @@ CXX?=$(SWIPL_CXX)

all: $(SOBJ)

c/libhdt.a: $(HDTLIB)/libhdt.a
ln -f -s $$PWD/$< $@

c/libcds.a: $(CDSLIB)/libcds.a
ln -f -s $$PWD/$< $@

$(SOBJ): $(OBJ) $(OBJ2)
$(SOBJ): $(OBJ) .hdt-cpp-sentinel
mkdir -p $(SWIPL_MODULE_DIR)
$(CXX) $(SWIPL_MODULE_LDFLAGS) -o $@ $< $(LIBS) $(SWIPL_MODULE_LIB) -lserd-0
$(CXX) $(SWIPL_MODULE_LDFLAGS) -o $@ $(OBJ) $(LIBS) $(SWIPL_MODULE_LIB) -lserd-0

c/hdt4pl.o: c/hdt4pl.cpp .hdt-cpp-sentinel
$(CXX) $(CXXFLAGS) -c -o $@ c/hdt4pl.cpp
Expand Down

0 comments on commit f6a5f74

Please sign in to comment.