Skip to content
Snippets Groups Projects
Commit 33018704 authored by namark's avatar namark
Browse files

No longer depending on /dev/null timestamps,

and finer grained uninstall targets.
parent 3cc7a13d
No related branches found
No related tags found
No related merge requests found
...@@ -2,6 +2,7 @@ INSTALL_INCLUDE := include ...@@ -2,6 +2,7 @@ INSTALL_INCLUDE := include
ifneq ($(shell cat COPYRIGHT 2> /dev/null),) ifneq ($(shell cat COPYRIGHT 2> /dev/null),)
COPYRIGHT ?= COPYRIGHT COPYRIGHT ?= COPYRIGHT
COPYRIGHT_DEP = COPYRIGHT
else else
COPYRIGHT ?= /dev/null COPYRIGHT ?= /dev/null
endif endif
...@@ -20,14 +21,14 @@ default: ...@@ -20,14 +21,14 @@ default:
install: $(INCLUDE) install: $(INCLUDE)
@echo Install complete! @echo Install complete!
$(INCDIR)/%.h: $(SRCDIR)/%.h $(COPYRIGHT) $(INCDIR)/%.h: $(SRCDIR)/%.h $(COPYRIGHT_DEP)
@mkdir -p $(@D) @mkdir -p $(@D)
cat $(COPYRIGHT) >> $@ 2> /dev/null || true cat $(COPYRIGHT) >> $@
cat $< >> $@ cat $< >> $@
$(INCDIR)/%.hpp: $(SRCDIR)/%.hpp $(COPYRIGHT) $(INCDIR)/%.hpp: $(SRCDIR)/%.hpp $(COPYRIGHT_DEP)
@mkdir -p $(@D) @mkdir -p $(@D)
cat $(COPYRIGHT) >> $@ 2> /dev/null || true cat $(COPYRIGHT) >> $@
cat $< >> $@ cat $< >> $@
uninstall: uninstall:
......
...@@ -15,6 +15,7 @@ INSTALL_LIB := lib ...@@ -15,6 +15,7 @@ INSTALL_LIB := lib
ifneq ($(shell cat COPYRIGHT 2> /dev/null),) ifneq ($(shell cat COPYRIGHT 2> /dev/null),)
COPYRIGHT ?= COPYRIGHT COPYRIGHT ?= COPYRIGHT
COPYRIGHT_DEP = COPYRIGHT
else else
COPYRIGHT ?= /dev/null COPYRIGHT ?= /dev/null
endif endif
...@@ -96,21 +97,21 @@ $(LIBDIR)/$(TARGET): $(OUT) | $(LIBDIR) ...@@ -96,21 +97,21 @@ $(LIBDIR)/$(TARGET): $(OUT) | $(LIBDIR)
$(LIBDIR): $(LIBDIR):
@mkdir -p $@ @mkdir -p $@
$(INCDIR)/%.h: $(SRCDIR)/%.h $(COPYRIGHT) $(INCDIR)/%.h: $(SRCDIR)/%.h $(COPYRIGHT_DEP)
@mkdir -p $(@D) @mkdir -p $(@D)
cat $(COPYRIGHT) >> $@ 2> /dev/null || true cat $(COPYRIGHT) >> $@
cat $< >> $@ cat $< >> $@
$(INCDIR)/%.hpp: $(SRCDIR)/%.hpp $(COPYRIGHT) $(INCDIR)/%.hpp: $(SRCDIR)/%.hpp $(COPYRIGHT_DEP)
@mkdir -p $(@D) @mkdir -p $(@D)
cat $(COPYRIGHT) >> $@ 2> /dev/null || true cat $(COPYRIGHT) >> $@
cat $< >> $@ cat $< >> $@
install_source: $(INSTALL_SOURCES) install_source: $(INSTALL_SOURCES)
$(INSTALL_SRCDIR)/%: $(SRCDIR)/% $(COPYRIGHT) $(INSTALL_SRCDIR)/%: $(SRCDIR)/% $(COPYRIGHT_DEP)
@mkdir -p $(@D) @mkdir -p $(@D)
cat $(COPYRIGHT) >> $@ 2> /dev/null || true cat $(COPYRIGHT) >> $@
cat $< >> $@ cat $< >> $@
uninstall: uninstall:
...@@ -118,11 +119,18 @@ uninstall: ...@@ -118,11 +119,18 @@ uninstall:
@rmdir -p $(INCDIRS) 2> /dev/null || true @rmdir -p $(INCDIRS) 2> /dev/null || true
-rm $(LIBDIR)/$(TARGET) -rm $(LIBDIR)/$(TARGET)
@rmdir -p $(LIBDIR) 2> /dev/null || true @rmdir -p $(LIBDIR) 2> /dev/null || true
@echo Archives/includes uninstalled!
uninstall_source:
-rm $(INSTALL_SOURCES) -rm $(INSTALL_SOURCES)
@rmdir -p $(INSTALL_SRCDIRS) 2> /dev/null || true @rmdir -p $(INSTALL_SRCDIRS) 2> /dev/null || true
@echo Uninstall complete! @echo Source code uninstalled!
uninstall_all: uninstall uninstall_source
@echo Everything uninstalled!
-include $(DEPENDS) -include $(DEPENDS)
.PRECIOUS : $(OBJECTS) .PRECIOUS : $(OBJECTS)
.PHONY : clean distclean uninstall .PHONY : clean distclean uninstall uninstall_source uninstall_all
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment