mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 05:27:51 +08:00
27c6c94202
* update all 16 configure_make ports * add make wrappers for msvc * improve make builds * fix relativ path errors on linux (and osx?) * revisit all 16 portfiles again * remove trace from install * fix relative build path issues. * bump control of the 16 configure ports * never forget .... real linux is case sensitive .... * Revert "bump control of the 16 configure ports" This reverts commit40d6d81c01. * Revert "Revert "bump control of the 16 configure ports"" This reverts commit9c9851ddfc. * bump control again for real ci rebuild * add copy_source * remove message * pass parameters to vcpkg_build_make * fix healpix build. * fix libmagic regression * fix libwandio regression * pfring changes regression fix? (cannot test in wsl) * ws change to retrigger CI * fix libpq regression * fix libudns regression * add share/pkgconfig to PKG_CONFIG_PATH * cleanup of deprecated options * cleanup docs * Revert "bump control again for real ci rebuild" This reverts commitb4bc18edc2. * shared binaries on linux should stay in lib. Only dlls are mvoed to bin * move pkgconfig check and add message about missing system packages * added autopoint as a build requirement * fix prerun shell working dir. * a few fixes from the x windows pr - add libpath setting - fixed pkgconfig search on windows platforms - fixed autopoint msys package on windows * fix release prefix * minimal cleanup and ws changes to trigger true CI rebuild * fix tcl by upgrading * remove unnecessary rename * fix pfring? can't test in WSL. Linux kernel headers required. * fix lowercase in patch * fix libwandio * remove x264 from fail list * replace wrappers with wrappers from automake * update make ports * remove unnecessary message * refactor vcpkg_configure_make * [tcl] remove stray ? * [farmhash] fix build * [freexl] ws change to retrigger ci build * [x264] add pthread as a dependency * [vcpkg/scripts] add ignore flag correctly * [sdl] fix vcpkg_fixup_pkgconfig call * [farmhash/freexl] delete configure and recreate it. * [libudns] remove trailing ? * [freexl] use empty build target * [freexl] add system library; remove previous change * Update ports/x264/portfile.cmake Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * [libwandio] remove unncessary comment Co-authored-by: dan-shaw <51385773+dan-shaw@users.noreply.github.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
60 lines
1.1 KiB
Diff
60 lines
1.1 KiB
Diff
diff --git a/Makefile b/Makefile
|
|
index 4b377c628..39cbf5cb4 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -1,10 +1,12 @@
|
|
all:
|
|
- cd kernel; make
|
|
- cd userland; ./configure; make
|
|
- cd drivers; make
|
|
+ $(MAKE) -C kernel;
|
|
+ #cd kernel; make
|
|
+ cd userland; ./configure;
|
|
+ $(MAKE) -C userland;
|
|
+ $(MAKE) -C drivers;
|
|
|
|
install:
|
|
- cd userland; make install
|
|
+ $(MAKE) install -C userland;
|
|
|
|
clean:
|
|
-cd kernel; make clean
|
|
diff --git a/userland/Makefile b/userland/Makefile
|
|
index 959470c0f..e35ca8de7 100644
|
|
--- a/userland/Makefile
|
|
+++ b/userland/Makefile
|
|
@@ -9,22 +9,22 @@ lib/Makefile:
|
|
config: lib/Makefile
|
|
|
|
libpfring: config
|
|
- cd lib; make
|
|
+ $(MAKE) -C lib
|
|
|
|
build_nbpf: config
|
|
- cd nbpf; make
|
|
+ $(MAKE) -C nbpf
|
|
|
|
build_c++: libpfring
|
|
- cd c++; make
|
|
+ $(MAKE) -C c++
|
|
|
|
tcpdump/Makefile:
|
|
cd tcpdump; ./configure --with_system_libpcap=yes
|
|
|
|
build_tcpdump: libpfring tcpdump/Makefile
|
|
- cd tcpdump; make
|
|
+ $(MAKE) -C tcpdump
|
|
|
|
build_extcap: libpfring
|
|
- cd wireshark/extcap; make
|
|
+ $(MAKE) -C wireshark/extcap
|
|
|
|
###################
|
|
|
|
@@ -46,4 +46,4 @@ extcap_clean:
|
|
cd wireshark/extcap; make clean
|
|
|
|
install: libpfring
|
|
- cd lib; make install
|
|
+ $(MAKE) -C lib install
|