jon/web-dslr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Git lock errors and a bit of cleanup

Browse Source
This commit is contained in:
Ingvar Stepanyan
2021-08-06 23:52:40 +00:00
parent 3c89a9c932
commit c1b98d4e52
1 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Makefile
View File

@@ -30,41 +30,37 @@ api.o: CXXFLAGS += -std=c++17 -fexceptions
$(SYSROOT): $(SYSROOT):
mkdir -p $(@D) mkdir -p $(@D)
deps/%/configure.ac:
git submodule update --init $(@D)
deps/%/configure: deps/%/configure.ac | $(SYSROOT)/lib/libltdl.la
cd $(@D) && autoreconf -fiv
deps/%/Makefile: deps/%/configure
cd $(@D) && ./configure --prefix=$(SYSROOT) --disable-shared $(CONFIGURE_ARGS)
## libtool ## libtool
deps/libtool/configure: deps/libtool/configure:
mkdir -p deps/libtool mkdir -p deps/libtool
curl -L https://ftpmirror.gnu.org/libtool/libtool-2.4.6.tar.gz | tar zx --strip 1 -C deps/libtool curl -L https://ftpmirror.gnu.org/libtool/libtool-2.4.6.tar.gz | tar zx --strip 1 -C deps/libtool
deps/libtool/Makefile: deps/libtool/configure
cd $(@D) && ./configure --prefix=$(SYSROOT) --disable-shared
$(SYSROOT)/lib/libltdl.la: deps/libtool/Makefile | $(SYSROOT) $(SYSROOT)/lib/libltdl.la: deps/libtool/Makefile | $(SYSROOT)
$(MAKE) -C deps/libtool install $(MAKE) -C deps/libtool install
## libusb
deps/libusb/Makefile: CONFIGURE_ARGS = --host=wasm32
$(SYSROOT)/lib/libusb-1.0.la: deps/libusb/Makefile
$(MAKE) -C deps/libusb install
## libgphoto2 ## libgphoto2
deps/libgphoto2/configure.ac deps/libusb/configure.ac &: deps/libgphoto2/Makefile: | $(SYSROOT)/lib/libusb-1.0.la
git submodule update --init deps/libgphoto2/Makefile: CONFIGURE_ARGS = --host=wasm32 \
deps/libgphoto2/configure: deps/libusb/configure.ac | $(SYSROOT)/lib/libltdl.la
cd $(@D) && autoreconf -fiv
deps/libgphoto2/Makefile: deps/libgphoto2/configure | $(SYSROOT)/lib/libusb-1.0.la
./configure --prefix=$(SYSROOT) --disable-shared --host=wasm32 \
--without-libxml-2.0 --disable-nls --disable-ptpip --disable-disk \ --without-libxml-2.0 --disable-nls --disable-ptpip --disable-disk \
--with-camlibs=ptp2 --with-camlibs=ptp2
$(SYSROOT)/lib/libgphoto2.la: deps/libgphoto2/Makefile $(SYSROOT)/lib/libusb-1.0.la $(SYSROOT)/lib/libltdl.la $(SYSROOT)/lib/libgphoto2.la: deps/libgphoto2/Makefile $(SYSROOT)/lib/libusb-1.0.la $(SYSROOT)/lib/libltdl.la
$(MAKE) -C deps/libgphoto2 install $(MAKE) -C deps/libgphoto2 install
## libusb
deps/libusb/configure: deps/libusb/configure.ac | $(SYSROOT)/lib/libltdl.la
cd $(@D) && autoreconf -fiv
deps/libusb/Makefile: deps/libusb/configure
cd $(@D) && ./configure --prefix=$(SYSROOT) --disable-shared --host=wasm32
$(SYSROOT)/lib/libusb-1.0.la: deps/libusb/Makefile
$(MAKE) -C deps/libusb install