Browse Source

minor build system changes

master
Luca Saiu 3 weeks ago
parent
commit
418b6bac49
2 changed files with 9 additions and 2 deletions
  1. +5
    -2
      src/Makefile
  2. +4
    -0
      test/Makefile

+ 5
- 2
src/Makefile View File

@ -92,9 +92,11 @@ all: $(TARGET)
sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
rm -f $@.$$$$
# If only the goal 'clean' is given, do not generate and include the '%.d' files.
# Do not generate and include the '%.d' files if cleaning or uninstalling.
ifneq ($(MAKECMDGOALS),clean)
-include $(DEPENDS)
ifneq ($(MAKECMDGOALS),uninstall)
-include $(DEPENDS)
endif
endif
$(TARGET): libpEpEngine.a
@ -129,6 +131,7 @@ install_headers: $(TARGET)
cp $(HEADERS_TO_INSTALL) $(DESTDIR)$(PREFIX)/include/pEp/
# FIXME: Does anyone but Roker use install_headers? Otherwise, remove the dependency.
# I occasionally use it. --positron
install: $(TARGET) install_headers
mkdir -p "$(DESTDIR)$(PREFIX)/lib/"
cp -v $< $(DESTDIR)$(PREFIX)/lib/


+ 4
- 0
test/Makefile View File

@ -96,6 +96,10 @@ else
LIBPATH=LD_LIBRARY_PATH
endif
# The LIBPATH variable, whatever it is, should have the value of EXTRA_LIB_PATHS
# *prepended* to it -- without the rest of the path being lost. This allows the
# user to use manually-installed version of some dependency libraries rather
# than system libraries.
TEST_CMD_PFX=$(LIBPATH)="$(EXTRA_LIB_PATHS):$$$(LIBPATH)"
ifeq ($(TEST_CMD_PFX),)
TEST_CMD_PFX=


Loading…
Cancel
Save