Browse Source

Fix error messages, a typo and use CC/CXX instead of LD

doc_update_sequoia
Damiano Boppart 5 years ago
parent
commit
bcc99831ae
3 changed files with 6 additions and 11 deletions
  1. +0
    -2
      build-config/common.conf
  2. +5
    -7
      src/Makefile
  3. +1
    -2
      test/Makefile

+ 0
- 2
build-config/common.conf View File

@ -28,8 +28,6 @@ CPPFLAGS=
#CXXFLAGS This option is platform-specific
######### C and C++ #########
# LD will be overwritten for test/Makefile
LD=$(CC)
# The following two variables will be appended to, you can thus not set them here to fixed value.
LDFLAGS=
LDLIBS=


+ 5
- 7
src/Makefile View File

@ -15,7 +15,7 @@ ifeq ($(BUILD_ON),Darwin)
#LDFLAGS+= -L/opt/local/lib
LDLIBS+= -lsqlite3 -lz -liconv
else
$(error don't know how to make for $(BUILD_FOR) on $(BUILD_ON))
$(error I don't know how to make for $(BUILD_FOR) on $(BUILD_ON))
endif
else ifeq ($(BUILD_ON),Linux)
ifeq ($(BUILD_FOR),Linux)
@ -23,13 +23,12 @@ else ifeq ($(BUILD_ON),Linux)
CFLAGS+= -DSQLITE_THREADSAFE=1 -D_GNU_SOURCE
LDLIBS+= -ldl -luuid
else
$(error don't know how to make for $(BUILD_FOR) on $(BUILD_ON))
$(error I don't know how to make for $(BUILD_FOR) on $(BUILD_ON))
endif
else
$(error don't know how to make for $(BUILD_FOR) on $(BUILD_ON))
$(error I don't know how to make for $(BUILD_FOR) on $(BUILD_ON))
endif
ifeq ($(OPENPGP),GPG)
NO_SOURCE=pgp_netpgp.c
CFLAGS+= -DUSE_GPG $(GPGME_INC) -DLIBGPGME=\"$(LIBGPGME)\"
@ -63,9 +62,9 @@ include Makefile.protocols
-include $(DEPENDS)
$(TARGET): libpEpEngine.a
$(LD) $(ALL_OBJECTS) $(LDFLAGS) $(LDLIBS) -o $@
$(CC) $(ALL_OBJECTS) $(LDFLAGS) $(LDLIBS) -o $@
.PHONY: object
.PHONY: objects
objects: $(ALL_OBJECTS)
libpEpEngine.a: $(ALL_OBJECTS)
@ -85,4 +84,3 @@ install: $(TARGET)
uninstall:
rm -f $(PREFIX)/lib/$(TARGET)
rm -rf $(PREFIX)/include/pEp

+ 1
- 2
test/Makefile View File

@ -7,7 +7,6 @@ HERE:=$(CURDIR)
include ../Makefile.conf
LD=$(CXX)
LDFLAGS+= $(ETPAN_LIB) -L../asn.1
LDLIBS?=-letpan -lpEpEngine -lstdc++ -lasn1
ifeq ($(BUILD_FOR),Linux)
@ -67,7 +66,7 @@ test: pEpEngineTest test_home_
$(TEST_CMD_PFX) ./pEpEngineTest
%_test : %_test.o test_util.o
$(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS)
$(CXX) $(LDFLAGS) -o $@ $^ $(LDLIBS)
%_run : % test_home_
$(TEST_CMD_PFX) ./$<


Loading…
Cancel
Save