Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Use stamp files to build freetype and libav from Makefile

  • Loading branch information...
commit b5e514e99959cc732dfef9488040856d302cc12e 1 parent a955c2e
Andreas Öman andoma authored

Showing 2 changed files with 26 additions and 6 deletions. Show diff stats Hide diff stats

  1. +21 0 Makefile
  2. +5 6 support/configure.inc
21 Makefile
@@ -23,6 +23,8 @@ ALLDEPS=${BUILDDIR}/config.mak Makefile support/${OS}.mk
23 23
24 24 include ${CURDIR}/config.default
25 25
  26 +ALLDEPS += ${STAMPS}
  27 +
26 28 OPTFLAGS ?= -O2
27 29
28 30 BUILDDIR = build.${BUILD}
@@ -686,3 +688,22 @@ $(BUILDDIR)/bundles/%.o: $(BUILDDIR)/bundles/%.c $(ALLDEPS)
686 688 $(BUILDDIR)/bundles/%.c: % $(CURDIR)/support/mkbundle $(ALLDEPS)
687 689 @mkdir -p $(dir $@)
688 690 $(MKBUNDLE) -o $@ -s $< -d ${BUILDDIR}/bundles/$<.d -p $<
  691 +
  692 +#
  693 +#
  694 +#
  695 +$(BUILDDIR)/libav.stamp:
  696 + ${MAKE} -C ${LIBAV_BUILD_DIR}
  697 + ${MAKE} -C ${LIBAV_BUILD_DIR} install
  698 + @mkdir -p $(dir $@)
  699 + touch $@
  700 +
  701 +#
  702 +#
  703 +#
  704 +$(BUILDDIR)/freetype.stamp:
  705 + ${MAKE} -C ${LIBAV_BUILD_DIR}
  706 + ${MAKE} -C ${LIBAV_BUILD_DIR} install
  707 + @mkdir -p $(dir $@)
  708 + touch $@
  709 +
11 support/configure.inc
@@ -16,7 +16,6 @@ BUILD=${CONFIGURE_POSTFIX}
16 16 TMPDIR=${TOPDIR}/tmp
17 17 GLW_DEFAULT_SKIN="default"
18 18 DEFAULT_LOGTARGET=""
19   -JARGS=""
20 19 LIBSPOTIFY_VERSION="12.1.51"
21 20
22 21 CONFIG_LIST="
@@ -224,7 +223,7 @@ common_opt(){
224 223 fi
225 224 ;;
226 225
227   - --jobs=*) JARGS="-j$2"
  226 + --jobs=*)
228 227 ;;
229 228
230 229 --cleanbuild) enable cleanbuild
@@ -317,9 +316,9 @@ libav_setup() {
317 316
318 317 (cd ${LIBAV_BUILD_DIR} && ${TOPDIR}/ext/libav/configure ${LIBAV_ARCH_FLAGS} ${LIBAV_COMMON_FLAGS} --prefix=${LIBAV_INSTALL_DIR} --extra-cflags="${LIBAV_CFLAGS} ${EXTRA_CFLAGS}" --extra-ldflags="${LIBAV_LDFLAGS} ${EXTRA_LDFLAGS}" --cc="${CC}") || die
319 318
320   - (cd ${LIBAV_BUILD_DIR} && make ${JARGS}) || die
321   - (cd ${LIBAV_BUILD_DIR} && make ${JARGS} install) || die
322 319 LIBAV_PATH=${LIBAV_INSTALL_DIR}
  320 + echo >>${CONFIG_MAK} "LIBAV_BUILD_DIR=${LIBAV_BUILD_DIR}"
  321 + echo >>${CONFIG_MAK} "STAMPS += build.${BUILD}/libav.stamp"
323 322 }
324 323
325 324
@@ -348,8 +347,8 @@ freetype_setup()
348 347 --enable-static=yes \
349 348 --enable-shared=no)
350 349
351   - (cd ${FREETYPE_BUILD_DIR} && make ${JARGS}) || die
352   - (cd ${FREETYPE_BUILD_DIR} && make ${JARGS} install) || die
  350 + echo >>${CONFIG_MAK} "FREETYPE_BUILD_DIR=${FREETYPE_BUILD_DIR}"
  351 + echo >>${CONFIG_MAK} "STAMPS += build.${BUILD}/freetype.stamp"
353 352
354 353 echo >>${CONFIG_MAK} "CFLAGS_cfg += -I${FREETYPE_INSTALL_DIR}/include -I${FREETYPE_INSTALL_DIR}/include/freetype2"
355 354 echo >>${CONFIG_MAK} "LDFLAGS_cfg += -L${FREETYPE_INSTALL_DIR}/lib -lfreetype -lbz2"

0 comments on commit b5e514e

Please sign in to comment.
Something went wrong with that request. Please try again.