From 0db9c5fe94040d18d7e4d86d4d07d8b715007bd4 Mon Sep 17 00:00:00 2001 From: Turiiya <34311583+ttytm@users.noreply.github.com> Date: Tue, 5 Sep 2023 00:25:01 +0200 Subject: [PATCH] Remove remaining `@cd "$(_LIB)" && $(MAKE)` residues in examples --- .../C++/call_cpp_from_js/Windows/MSVC/Makefile | 4 ---- .../C++/call_cpp_from_js/macOS/Clang/Makefile | 16 ++++++---------- .../C++/call_js_from_cpp/Windows/MSVC/Makefile | 4 ---- .../C++/call_js_from_cpp/macOS/Clang/Makefile | 16 ++++++---------- examples/C++/minimal/Windows/MSVC/Makefile | 4 ---- examples/C++/minimal/macOS/Clang/Makefile | 16 ++++++---------- .../C++/serve_a_folder/Windows/MSVC/Makefile | 4 ---- examples/C++/serve_a_folder/macOS/Clang/Makefile | 16 ++++++---------- examples/C/call_js_from_c/Windows/MSVC/Makefile | 4 ---- examples/C/call_js_from_c/macOS/Clang/Makefile | 16 ++++++---------- examples/C/minimal/Windows/MSVC/Makefile | 4 ---- examples/C/minimal/macOS/Clang/Makefile | 16 ++++++---------- examples/C/serve_a_folder/Windows/MSVC/Makefile | 4 ---- examples/C/serve_a_folder/macOS/Clang/Makefile | 16 ++++++---------- 14 files changed, 42 insertions(+), 98 deletions(-) diff --git a/examples/C++/call_cpp_from_js/Windows/MSVC/Makefile b/examples/C++/call_cpp_from_js/Windows/MSVC/Makefile index afa13761c..703ad8686 100644 --- a/examples/C++/call_cpp_from_js/Windows/MSVC/Makefile +++ b/examples/C++/call_cpp_from_js/Windows/MSVC/Makefile @@ -10,8 +10,6 @@ _SOURCE=../../ all: release debug: -# Build Lib - @cd "$(_LIB)" && $(MAKE) debug # Static with Debug info @echo Build C++ Example (Debug Static)... @rc win.rc 1>NUL 2>&1 @@ -22,8 +20,6 @@ debug: @cl /Zi /EHsc /std:c++17 "$(_SOURCE)/main.cpp" /I "$(_INCLUDE)" /link /LIBPATH:"$(_LIB)" /MACHINE:X64 /SUBSYSTEM:CONSOLE win.res webui-2.lib user32.lib Advapi32.lib /OUT:main-dyn.exe 1>NUL 2>&1 release: -# Build Lib - @cd "$(_LIB)" && $(MAKE) # Static Release @echo Build C++ Example (Release Static)... @rc win.rc 1>NUL 2>&1 diff --git a/examples/C++/call_cpp_from_js/macOS/Clang/Makefile b/examples/C++/call_cpp_from_js/macOS/Clang/Makefile index 3142ac831..1a09b06b1 100644 --- a/examples/C++/call_cpp_from_js/macOS/Clang/Makefile +++ b/examples/C++/call_cpp_from_js/macOS/Clang/Makefile @@ -9,29 +9,25 @@ SOURCE=../.. all: release debug: - # Build Lib - @cd "$(LIB)" && $(MAKE) debug - # Static with Debug info +# Static with Debug info @echo "Build C++ Example (Static Debug)..." @clang -std=c++17 -g -m64 -o main "$(SOURCE)/main.cpp" -I "$(INCLUDE)" -L "$(LIB)" -lwebui-2-static -lpthread -lm - # Dynamic with Debug info +# Dynamic with Debug info @echo "Build C++ Example (Dynamic Debug)..." @clang -std=c++17 -g -m64 -o main-dyn "$(SOURCE)/main.cpp" -I "$(INCLUDE)" -L "$(LIB)" "$(LIB)/webui-2.dyn" -lpthread -lm - # Clean +# Clean @- rm -f *.o @- rm -rf *.dSYM @echo "Done." release: - # Build Lib - @cd "$(LIB)" && $(MAKE) - # Static Release +# Static Release @echo "Build C++ Example (Static Release)..." @clang -std=c++17 -lstdc++ -Os -m64 -o main "$(SOURCE)/main.cpp" -I "$(INCLUDE)" -L "$(LIB)" -lwebui-2-static -lpthread -lm - # Dynamic Release +# Dynamic Release @echo "Build C++ Example (Dynamic Release)..." @clang -std=c++17 -lstdc++ -m64 -o main-dyn "$(SOURCE)/main.cpp" -I "$(INCLUDE)" -L "$(LIB)" "$(LIB)/webui-2.dyn" -lpthread -lm - # Clean +# Clean @- rm -f *.o @- rm -rf *.dSYM @echo "Done." diff --git a/examples/C++/call_js_from_cpp/Windows/MSVC/Makefile b/examples/C++/call_js_from_cpp/Windows/MSVC/Makefile index afa13761c..703ad8686 100644 --- a/examples/C++/call_js_from_cpp/Windows/MSVC/Makefile +++ b/examples/C++/call_js_from_cpp/Windows/MSVC/Makefile @@ -10,8 +10,6 @@ _SOURCE=../../ all: release debug: -# Build Lib - @cd "$(_LIB)" && $(MAKE) debug # Static with Debug info @echo Build C++ Example (Debug Static)... @rc win.rc 1>NUL 2>&1 @@ -22,8 +20,6 @@ debug: @cl /Zi /EHsc /std:c++17 "$(_SOURCE)/main.cpp" /I "$(_INCLUDE)" /link /LIBPATH:"$(_LIB)" /MACHINE:X64 /SUBSYSTEM:CONSOLE win.res webui-2.lib user32.lib Advapi32.lib /OUT:main-dyn.exe 1>NUL 2>&1 release: -# Build Lib - @cd "$(_LIB)" && $(MAKE) # Static Release @echo Build C++ Example (Release Static)... @rc win.rc 1>NUL 2>&1 diff --git a/examples/C++/call_js_from_cpp/macOS/Clang/Makefile b/examples/C++/call_js_from_cpp/macOS/Clang/Makefile index 3142ac831..1a09b06b1 100644 --- a/examples/C++/call_js_from_cpp/macOS/Clang/Makefile +++ b/examples/C++/call_js_from_cpp/macOS/Clang/Makefile @@ -9,29 +9,25 @@ SOURCE=../.. all: release debug: - # Build Lib - @cd "$(LIB)" && $(MAKE) debug - # Static with Debug info +# Static with Debug info @echo "Build C++ Example (Static Debug)..." @clang -std=c++17 -g -m64 -o main "$(SOURCE)/main.cpp" -I "$(INCLUDE)" -L "$(LIB)" -lwebui-2-static -lpthread -lm - # Dynamic with Debug info +# Dynamic with Debug info @echo "Build C++ Example (Dynamic Debug)..." @clang -std=c++17 -g -m64 -o main-dyn "$(SOURCE)/main.cpp" -I "$(INCLUDE)" -L "$(LIB)" "$(LIB)/webui-2.dyn" -lpthread -lm - # Clean +# Clean @- rm -f *.o @- rm -rf *.dSYM @echo "Done." release: - # Build Lib - @cd "$(LIB)" && $(MAKE) - # Static Release +# Static Release @echo "Build C++ Example (Static Release)..." @clang -std=c++17 -lstdc++ -Os -m64 -o main "$(SOURCE)/main.cpp" -I "$(INCLUDE)" -L "$(LIB)" -lwebui-2-static -lpthread -lm - # Dynamic Release +# Dynamic Release @echo "Build C++ Example (Dynamic Release)..." @clang -std=c++17 -lstdc++ -m64 -o main-dyn "$(SOURCE)/main.cpp" -I "$(INCLUDE)" -L "$(LIB)" "$(LIB)/webui-2.dyn" -lpthread -lm - # Clean +# Clean @- rm -f *.o @- rm -rf *.dSYM @echo "Done." diff --git a/examples/C++/minimal/Windows/MSVC/Makefile b/examples/C++/minimal/Windows/MSVC/Makefile index afa13761c..703ad8686 100644 --- a/examples/C++/minimal/Windows/MSVC/Makefile +++ b/examples/C++/minimal/Windows/MSVC/Makefile @@ -10,8 +10,6 @@ _SOURCE=../../ all: release debug: -# Build Lib - @cd "$(_LIB)" && $(MAKE) debug # Static with Debug info @echo Build C++ Example (Debug Static)... @rc win.rc 1>NUL 2>&1 @@ -22,8 +20,6 @@ debug: @cl /Zi /EHsc /std:c++17 "$(_SOURCE)/main.cpp" /I "$(_INCLUDE)" /link /LIBPATH:"$(_LIB)" /MACHINE:X64 /SUBSYSTEM:CONSOLE win.res webui-2.lib user32.lib Advapi32.lib /OUT:main-dyn.exe 1>NUL 2>&1 release: -# Build Lib - @cd "$(_LIB)" && $(MAKE) # Static Release @echo Build C++ Example (Release Static)... @rc win.rc 1>NUL 2>&1 diff --git a/examples/C++/minimal/macOS/Clang/Makefile b/examples/C++/minimal/macOS/Clang/Makefile index 3142ac831..1a09b06b1 100644 --- a/examples/C++/minimal/macOS/Clang/Makefile +++ b/examples/C++/minimal/macOS/Clang/Makefile @@ -9,29 +9,25 @@ SOURCE=../.. all: release debug: - # Build Lib - @cd "$(LIB)" && $(MAKE) debug - # Static with Debug info +# Static with Debug info @echo "Build C++ Example (Static Debug)..." @clang -std=c++17 -g -m64 -o main "$(SOURCE)/main.cpp" -I "$(INCLUDE)" -L "$(LIB)" -lwebui-2-static -lpthread -lm - # Dynamic with Debug info +# Dynamic with Debug info @echo "Build C++ Example (Dynamic Debug)..." @clang -std=c++17 -g -m64 -o main-dyn "$(SOURCE)/main.cpp" -I "$(INCLUDE)" -L "$(LIB)" "$(LIB)/webui-2.dyn" -lpthread -lm - # Clean +# Clean @- rm -f *.o @- rm -rf *.dSYM @echo "Done." release: - # Build Lib - @cd "$(LIB)" && $(MAKE) - # Static Release +# Static Release @echo "Build C++ Example (Static Release)..." @clang -std=c++17 -lstdc++ -Os -m64 -o main "$(SOURCE)/main.cpp" -I "$(INCLUDE)" -L "$(LIB)" -lwebui-2-static -lpthread -lm - # Dynamic Release +# Dynamic Release @echo "Build C++ Example (Dynamic Release)..." @clang -std=c++17 -lstdc++ -m64 -o main-dyn "$(SOURCE)/main.cpp" -I "$(INCLUDE)" -L "$(LIB)" "$(LIB)/webui-2.dyn" -lpthread -lm - # Clean +# Clean @- rm -f *.o @- rm -rf *.dSYM @echo "Done." diff --git a/examples/C++/serve_a_folder/Windows/MSVC/Makefile b/examples/C++/serve_a_folder/Windows/MSVC/Makefile index afa13761c..703ad8686 100644 --- a/examples/C++/serve_a_folder/Windows/MSVC/Makefile +++ b/examples/C++/serve_a_folder/Windows/MSVC/Makefile @@ -10,8 +10,6 @@ _SOURCE=../../ all: release debug: -# Build Lib - @cd "$(_LIB)" && $(MAKE) debug # Static with Debug info @echo Build C++ Example (Debug Static)... @rc win.rc 1>NUL 2>&1 @@ -22,8 +20,6 @@ debug: @cl /Zi /EHsc /std:c++17 "$(_SOURCE)/main.cpp" /I "$(_INCLUDE)" /link /LIBPATH:"$(_LIB)" /MACHINE:X64 /SUBSYSTEM:CONSOLE win.res webui-2.lib user32.lib Advapi32.lib /OUT:main-dyn.exe 1>NUL 2>&1 release: -# Build Lib - @cd "$(_LIB)" && $(MAKE) # Static Release @echo Build C++ Example (Release Static)... @rc win.rc 1>NUL 2>&1 diff --git a/examples/C++/serve_a_folder/macOS/Clang/Makefile b/examples/C++/serve_a_folder/macOS/Clang/Makefile index 3142ac831..1a09b06b1 100644 --- a/examples/C++/serve_a_folder/macOS/Clang/Makefile +++ b/examples/C++/serve_a_folder/macOS/Clang/Makefile @@ -9,29 +9,25 @@ SOURCE=../.. all: release debug: - # Build Lib - @cd "$(LIB)" && $(MAKE) debug - # Static with Debug info +# Static with Debug info @echo "Build C++ Example (Static Debug)..." @clang -std=c++17 -g -m64 -o main "$(SOURCE)/main.cpp" -I "$(INCLUDE)" -L "$(LIB)" -lwebui-2-static -lpthread -lm - # Dynamic with Debug info +# Dynamic with Debug info @echo "Build C++ Example (Dynamic Debug)..." @clang -std=c++17 -g -m64 -o main-dyn "$(SOURCE)/main.cpp" -I "$(INCLUDE)" -L "$(LIB)" "$(LIB)/webui-2.dyn" -lpthread -lm - # Clean +# Clean @- rm -f *.o @- rm -rf *.dSYM @echo "Done." release: - # Build Lib - @cd "$(LIB)" && $(MAKE) - # Static Release +# Static Release @echo "Build C++ Example (Static Release)..." @clang -std=c++17 -lstdc++ -Os -m64 -o main "$(SOURCE)/main.cpp" -I "$(INCLUDE)" -L "$(LIB)" -lwebui-2-static -lpthread -lm - # Dynamic Release +# Dynamic Release @echo "Build C++ Example (Dynamic Release)..." @clang -std=c++17 -lstdc++ -m64 -o main-dyn "$(SOURCE)/main.cpp" -I "$(INCLUDE)" -L "$(LIB)" "$(LIB)/webui-2.dyn" -lpthread -lm - # Clean +# Clean @- rm -f *.o @- rm -rf *.dSYM @echo "Done." diff --git a/examples/C/call_js_from_c/Windows/MSVC/Makefile b/examples/C/call_js_from_c/Windows/MSVC/Makefile index 372136361..d9a6d6fbe 100644 --- a/examples/C/call_js_from_c/Windows/MSVC/Makefile +++ b/examples/C/call_js_from_c/Windows/MSVC/Makefile @@ -10,8 +10,6 @@ _SOURCE=../../ all: release debug: -# Build Lib - @cd "$(_LIB)" && $(MAKE) debug # Static with Debug info @echo Build C99 Example (Static Debug)... @rc win.rc 1>NUL 2>&1 @@ -22,8 +20,6 @@ debug: @cl /Zi "$(_SOURCE)/main.c" /I "$(_INCLUDE)" /link /LIBPATH:"$(_LIB)" /MACHINE:X64 /SUBSYSTEM:CONSOLE win.res webui-2.lib user32.lib Advapi32.lib /OUT:main-dyn.exe 1>NUL 2>&1 release: -# Build Lib - @cd "$(_LIB)" && $(MAKE) # Static Release @echo Build C99 Example (Static Release)... @rc win.rc 1>NUL 2>&1 diff --git a/examples/C/call_js_from_c/macOS/Clang/Makefile b/examples/C/call_js_from_c/macOS/Clang/Makefile index 523cbd105..a1407f6e7 100644 --- a/examples/C/call_js_from_c/macOS/Clang/Makefile +++ b/examples/C/call_js_from_c/macOS/Clang/Makefile @@ -9,29 +9,25 @@ SOURCE=../.. all: release debug: - # Build Lib - @cd "$(LIB)" && $(MAKE) debug - # Static with Debug info +# Static with Debug info @echo "Build C99 Example (Static Debug)..." @clang -g -m64 -o main "$(SOURCE)/main.c" -I "$(INCLUDE)" -L "$(LIB)" -lwebui-2-static -lpthread -lm - # Dynamic with Debug info +# Dynamic with Debug info @echo "Build C99 Example (Dynamic Debug)..." @clang -g -m64 -o main-dyn "$(SOURCE)/main.c" -I "$(INCLUDE)" -L "$(LIB)" "$(LIB)/webui-2.dyn" -lpthread -lm - # Clean +# Clean @- rm -f *.o @- rm -rf *.dSYM @echo "Done." release: - # Build Lib - @cd "$(LIB)" && $(MAKE) - # Static Release +# Static Release @echo "Build C99 Example (Static Release)..." @clang -lstdc++ -Os -m64 -o main "$(SOURCE)/main.c" -I "$(INCLUDE)" -L "$(LIB)" -lwebui-2-static -lpthread -lm - # Dynamic Release +# Dynamic Release @echo "Build C99 Example (Dynamic Release)..." @clang -lstdc++ -m64 -o main-dyn "$(SOURCE)/main.c" -I "$(INCLUDE)" -L "$(LIB)" "$(LIB)/webui-2.dyn" -lpthread -lm - # Clean +# Clean @- rm -f *.o @- rm -rf *.dSYM @echo "Done." diff --git a/examples/C/minimal/Windows/MSVC/Makefile b/examples/C/minimal/Windows/MSVC/Makefile index 372136361..d9a6d6fbe 100644 --- a/examples/C/minimal/Windows/MSVC/Makefile +++ b/examples/C/minimal/Windows/MSVC/Makefile @@ -10,8 +10,6 @@ _SOURCE=../../ all: release debug: -# Build Lib - @cd "$(_LIB)" && $(MAKE) debug # Static with Debug info @echo Build C99 Example (Static Debug)... @rc win.rc 1>NUL 2>&1 @@ -22,8 +20,6 @@ debug: @cl /Zi "$(_SOURCE)/main.c" /I "$(_INCLUDE)" /link /LIBPATH:"$(_LIB)" /MACHINE:X64 /SUBSYSTEM:CONSOLE win.res webui-2.lib user32.lib Advapi32.lib /OUT:main-dyn.exe 1>NUL 2>&1 release: -# Build Lib - @cd "$(_LIB)" && $(MAKE) # Static Release @echo Build C99 Example (Static Release)... @rc win.rc 1>NUL 2>&1 diff --git a/examples/C/minimal/macOS/Clang/Makefile b/examples/C/minimal/macOS/Clang/Makefile index a6034fab7..7140513dc 100644 --- a/examples/C/minimal/macOS/Clang/Makefile +++ b/examples/C/minimal/macOS/Clang/Makefile @@ -9,29 +9,25 @@ SOURCE=../.. all: release debug: - # Build Lib - @cd "$(LIB)" && $(MAKE) debug - # Static with Debug info +# Static with Debug info @echo "Build C99 Example (Static Debug)..." @clang -g -m64 -o main "$(SOURCE)/main.c" -I "$(INCLUDE)" -L "$(LIB)" -lwebui-2-static -lpthread -lm - # Dynamic with Debug info +# Dynamic with Debug info @echo "Build C99 Example (Dynamic Debug)..." @clang -g -m64 -o main-dyn "$(SOURCE)/main.c" -I "$(INCLUDE)" -L "$(LIB)" "$(LIB)/webui-2.dyn" -lpthread -lm - # Clean +# Clean @- rm -f *.o @- rm -rf *.dSYM @echo "Done." release: - # Build Lib - @cd "$(LIB)" && $(MAKE) - # Static Release +# Static Release @echo "Build C99 Example (Static Release)..." @clang -lstdc++ -Os -m64 -o main "$(SOURCE)/main.c" -I "$(INCLUDE)" -L "$(LIB)" -lwebui-2-static -lpthread -lm - # Dynamic Release +# Dynamic Release @echo "Build C99 Example (Dynamic Release)..." @clang -lstdc++ -m64 -o main-dyn "$(SOURCE)/main.c" -I "$(INCLUDE)" -L "$(LIB)" "$(LIB)/webui-2.dyn" -lpthread -lm - # Clean +# Clean @- rm -f *.o @- rm -rf *.dSYM @echo "Done." diff --git a/examples/C/serve_a_folder/Windows/MSVC/Makefile b/examples/C/serve_a_folder/Windows/MSVC/Makefile index 372136361..d9a6d6fbe 100644 --- a/examples/C/serve_a_folder/Windows/MSVC/Makefile +++ b/examples/C/serve_a_folder/Windows/MSVC/Makefile @@ -10,8 +10,6 @@ _SOURCE=../../ all: release debug: -# Build Lib - @cd "$(_LIB)" && $(MAKE) debug # Static with Debug info @echo Build C99 Example (Static Debug)... @rc win.rc 1>NUL 2>&1 @@ -22,8 +20,6 @@ debug: @cl /Zi "$(_SOURCE)/main.c" /I "$(_INCLUDE)" /link /LIBPATH:"$(_LIB)" /MACHINE:X64 /SUBSYSTEM:CONSOLE win.res webui-2.lib user32.lib Advapi32.lib /OUT:main-dyn.exe 1>NUL 2>&1 release: -# Build Lib - @cd "$(_LIB)" && $(MAKE) # Static Release @echo Build C99 Example (Static Release)... @rc win.rc 1>NUL 2>&1 diff --git a/examples/C/serve_a_folder/macOS/Clang/Makefile b/examples/C/serve_a_folder/macOS/Clang/Makefile index a6034fab7..7140513dc 100644 --- a/examples/C/serve_a_folder/macOS/Clang/Makefile +++ b/examples/C/serve_a_folder/macOS/Clang/Makefile @@ -9,29 +9,25 @@ SOURCE=../.. all: release debug: - # Build Lib - @cd "$(LIB)" && $(MAKE) debug - # Static with Debug info +# Static with Debug info @echo "Build C99 Example (Static Debug)..." @clang -g -m64 -o main "$(SOURCE)/main.c" -I "$(INCLUDE)" -L "$(LIB)" -lwebui-2-static -lpthread -lm - # Dynamic with Debug info +# Dynamic with Debug info @echo "Build C99 Example (Dynamic Debug)..." @clang -g -m64 -o main-dyn "$(SOURCE)/main.c" -I "$(INCLUDE)" -L "$(LIB)" "$(LIB)/webui-2.dyn" -lpthread -lm - # Clean +# Clean @- rm -f *.o @- rm -rf *.dSYM @echo "Done." release: - # Build Lib - @cd "$(LIB)" && $(MAKE) - # Static Release +# Static Release @echo "Build C99 Example (Static Release)..." @clang -lstdc++ -Os -m64 -o main "$(SOURCE)/main.c" -I "$(INCLUDE)" -L "$(LIB)" -lwebui-2-static -lpthread -lm - # Dynamic Release +# Dynamic Release @echo "Build C99 Example (Dynamic Release)..." @clang -lstdc++ -m64 -o main-dyn "$(SOURCE)/main.c" -I "$(INCLUDE)" -L "$(LIB)" "$(LIB)/webui-2.dyn" -lpthread -lm - # Clean +# Clean @- rm -f *.o @- rm -rf *.dSYM @echo "Done."