Skip to content

Commit

Permalink
Merge pull request #2693 from thomasjacquin/Don't-include-sunwait
Browse files Browse the repository at this point in the history
Don't include sunwait
  • Loading branch information
EricClaeys authored May 24, 2023
2 parents 257afa1 + 6dc66ce commit d800720
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 56 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
[submodule "src/sunwait-src"]
path = src/sunwait-src
url = https://github.com/risacher/sunwait
2 changes: 2 additions & 0 deletions html/documentation/changeLog.html
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ <h4>Bug Fixes</h4>
<span class="fileName">image-YYYYMMDDHHMMSS.jpg</span>.
<li>The <code>scp</code> upload protocol now uses the
<span class="shSetting">REMOTE_USER</span> setting.
<li>The <code>sunwait</code> command is no longer included with Allsky.
It was created but never used so was simply taking disk space.
</ul>

<hr class="separator"><!-- =========================================== -->
Expand Down
20 changes: 2 additions & 18 deletions src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ endif

CFLAGS += $(DEFS) $(ZWOSDK)

all:check_deps capture_ZWO capture_RPi startrails keogram sunwait
all:check_deps capture_ZWO capture_RPi startrails keogram
.PHONY : all

ifneq ($(shell id -u), 0)
Expand All @@ -104,20 +104,6 @@ ifeq (,$(OPENCV))
endif
.PHONY : check_deps

patchsunwait:
@echo `date +%F\ %R:%S` Initializing sunwait submodule...
@git submodule init
@git submodule update
@echo `date +%F\ %R:%s` Patching sunwait compile warnings...
@patch -p1 -d sunwait-src/ < sunwait.patch
@touch patchsunwait

sunwait: patchsunwait
@echo `date +%F\ %R:%S` Building sunwait...
@$(MAKE) -C sunwait-src
@cp sunwait-src/sunwait .
@echo `date +%F\ %R:%S` Done.

allsky_common.o: allsky_common.cpp include/allsky_common.h
@echo Building $@ ...
@$(CC) -c allsky_common.cpp -o $@ $(CFLAGS) $(OPENCV)
Expand Down Expand Up @@ -183,7 +169,6 @@ install:
install -o $(SUDO_USER) -g $(SUDO_USER) keogram ../bin/; \
install -o $(SUDO_USER) -g $(SUDO_USER) startrails ../bin/; \
fi
@install sunwait $(DESTDIR)$(bindir)

uninstall:
@echo `date +%F\ %R:%S` Removing binaries...
Expand All @@ -192,7 +177,6 @@ uninstall:
rm -f $(DESTDIR)$(bindir)/capture_RPi; \
rm -f $(DESTDIR)$(bindir)/keogram; \
rm -f $(DESTDIR)$(bindir)/startrails; \
rm -f $(DESTDIR)$(bindir)/sunwait; \
else \
rm -f ../bin/capture_ZWO; \
rm -f ../bin/capture_RPi; \
Expand All @@ -204,7 +188,7 @@ endif # sudo / root check
.PHONY : install uninstall

clean:
rm -f capture_ZWO capture_RPi startrails keogram sunwait *.o *.a
rm -f capture_ZWO capture_RPi startrails keogram *.o *.a
.PHONY : clean

endif # Correct directory structure check
Expand Down
1 change: 0 additions & 1 deletion src/sunwait-src
Submodule sunwait-src deleted from 102cb4
34 changes: 0 additions & 34 deletions src/sunwait.patch

This file was deleted.

0 comments on commit d800720

Please sign in to comment.