Skip to content

Commit

Permalink
Build: consider IPCCOMPILER and FORMCOMPILER just for ordering
Browse files Browse the repository at this point in the history
Build them if they don't exist, but don't care about them being
newer or older than the target.

I believe this is what was causing build loops where IPCCompiler was
being run a second time, rebuilding its .h file, then a library
would depend on that .h file and get re-archived, then an
application would need relinking, and something in that whole
process would trigger IPCCompiler running again touching its .h
file.
  • Loading branch information
jcs authored and awesomekling committed Dec 28, 2019
1 parent 0b50133 commit b624eaa
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Applications/FontEditor/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ LIB_DEPS = GUI Draw Core IPC

FontEditor.cpp: UI_FontEditorBottom.h

UI_FontEditorBottom.h: FontEditorBottom.frm FORMCOMPILER
UI_FontEditorBottom.h: FontEditorBottom.frm | FORMCOMPILER
$(QUIET) $(FORMCOMPILER) $< > $@

EXTRA_CLEAN = UI_FontEditorBottom.h
Expand Down
4 changes: 2 additions & 2 deletions Servers/AudioServer/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ EXTRA_CLEAN = AudioServerEndpoint.h AudioClientEndpoint.h

*.cpp: AudioServerEndpoint.h AudioClientEndpoint.h

AudioServerEndpoint.h: AudioServer.ipc IPCCOMPILER
AudioServerEndpoint.h: AudioServer.ipc | IPCCOMPILER
@echo "IPC $<"; $(IPCCOMPILER) $< > $@

AudioClientEndpoint.h: AudioClient.ipc IPCCOMPILER
AudioClientEndpoint.h: AudioClient.ipc | IPCCOMPILER
@echo "IPC $<"; $(IPCCOMPILER) $< > $@

install:
Expand Down
4 changes: 2 additions & 2 deletions Servers/ProtocolServer/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ LIB_DEPS = Core IPC

*.cpp: ProtocolServerEndpoint.h ProtocolClientEndpoint.h

ProtocolServerEndpoint.h: ProtocolServer.ipc IPCCOMPILER
ProtocolServerEndpoint.h: ProtocolServer.ipc | IPCCOMPILER
@echo "IPC $<"; $(IPCCOMPILER) $< > $@

ProtocolClientEndpoint.h: ProtocolClient.ipc IPCCOMPILER
ProtocolClientEndpoint.h: ProtocolClient.ipc | IPCCOMPILER
@echo "IPC $<"; $(IPCCOMPILER) $< > $@

include ../../Makefile.common
4 changes: 2 additions & 2 deletions Servers/WindowServer/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ LIB_DEPS = Draw Core Thread Pthread IPC

*.cpp: WindowServerEndpoint.h WindowClientEndpoint.h

WindowServerEndpoint.h: WindowServer.ipc IPCCOMPILER
WindowServerEndpoint.h: WindowServer.ipc | IPCCOMPILER
@echo "IPC $<"; $(IPCCOMPILER) $< > $@

WindowClientEndpoint.h: WindowClient.ipc IPCCOMPILER
WindowClientEndpoint.h: WindowClient.ipc | IPCCOMPILER
@echo "IPC $<"; $(IPCCOMPILER) $< > $@

EXTRA_CLEAN = WindowServerEndpoint.h WindowClientEndpoint.h
Expand Down

0 comments on commit b624eaa

Please sign in to comment.