Skip to content

Commit

Permalink
build: remove distdir targets
Browse files Browse the repository at this point in the history
We do not create dist-tarballs, and calling it first sometimes causes
build failures: #108
Also simplify the multiple install-* targets.
  • Loading branch information
TheOneric committed Oct 31, 2021
1 parent 9424e8f commit 12758c4
Showing 1 changed file with 3 additions and 9 deletions.
12 changes: 3 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,7 @@ $(DIST_DIR)/lib/libfribidi.a: build/lib/fribidi/configure
--disable-dependency-tracking \
--disable-debug \
&& \
emmake make distdir && \
cd lib && \
emmake make install-libLTLIBRARIES install-pkgincludeHEADERS install-nodist_pkgincludeHEADERS && \
cd .. && \
emmake make -C lib/ install && \
emmake make install-pkgconfigDATA

build/lib/expat/configured: lib/expat
Expand Down Expand Up @@ -231,11 +228,8 @@ $(DIST_DIR)/lib/libfontconfig.a: $(DIST_DIR)/lib/libharfbuzz.a $(DIST_DIR)/lib/l
--disable-docs \
--with-default-fonts=/fonts \
&& \
cd src && \
emmake make distdir install-libLTLIBRARIES && \
cd ../fontconfig && \
emmake make distdir install-fontconfigincludeHEADERS && \
cd ../ && \
emmake make -C src/ install && \
emmake make -C fontconfig/ install && \
emmake make install-pkgconfigDATA

# libass --
Expand Down

0 comments on commit 12758c4

Please sign in to comment.