Skip to content
Browse files

Make libs compile cleanly

  • Loading branch information...
1 parent fe43e40 commit 9d0259181b46131c8d828998a70274f5fb9b3b5b @Beirdo Beirdo committed Apr 26, 2012
Showing with 47 additions and 6 deletions.
  1. +3 −4 mythtv/Makefile
  2. +42 −0 mythtv/external/Makefile
  3. +2 −2 mythtv/external/nzmqt/src/nzmqt.pro
View
7 mythtv/Makefile
@@ -1,8 +1,7 @@
include config.mak
-MAKE_SUBDIRS = external/FFmpeg external/zeromq
-QT_SUBDIRS = libs filters html programs themes i18n locales external/qjson
-QT_SUBDIRS += external/nzmqt/src
+MAKE_SUBDIRS = external
+QT_SUBDIRS = libs filters html programs themes i18n locales
ifdef CONFIG_BINDINGS_PERL
MAKE_SUBDIRS += bindings/perl
@@ -40,7 +39,7 @@ libs/libmythbase/version.h: version.sh force
sh version.sh $(PWD)
# explicit subdir dependencies
-libs: external/FFmpeg
+libs: external
filters: libs
programs: libs filters
View
42 mythtv/external/Makefile
@@ -0,0 +1,42 @@
+include ../config.mak
+
+SUBDIRS = FFmpeg zeromq nzmqt qjson
+
+SUBDIRS_ALL = $(addsuffix -all, ${SUBDIRS})
+SUBDIRS_INSTALL = $(addsuffix -install, ${SUBDIRS})
+SUBDIRS_UNINSTALL = $(addsuffix -uninstall, ${SUBDIRS})
+SUBDIRS_CLEAN = $(addsuffix -clean, ${SUBDIRS})
+SUBDIRS_DISTCLEAN = $(addsuffix -distclean, ${SUBDIRS})
+
+default: all
+all: ${SUBDIRS_ALL}
+install: ${SUBDIRS_INSTALL}
+uninstall: ${SUBDIRS_UNINSTALL}
+clean: ${SUBDIRS_CLEAN}
+distclean: ${SUBDIRS_DISTCLEAN}
+
+
+FFmpeg-all FFmpeg-install FFmpeg-uninstall FFmpeg-clean FFmpeg-distclean:
+ ${MAKE} -C FFmpeg ${@:FFmpeg-%=%}
+
+zeromq-all:
+ (cd zeromq ; ./configure --prefix=${PREFIX})
+ ${MAKE} -C zeromq all
+
+zeromq-install zeromq-uninstall zeromq-clean zeromq-distclean:
+ ${MAKE} -C zeromq ${@:zeromq-%=%}
+
+nzmqt-all:
+ (cd nzmqt/src ; ${QMAKE})
+ ${MAKE} -C nzmqt/src all
+
+nzmqt-install nzmqt-uninstall nzmqt-clean nzmqt-distclean:
+ ${MAKE} -C nzmqt/src ${@:nzmqt-%=%}
+
+qjson-all:
+ (cd qjson ; ${QMAKE})
+ ${MAKE} -C qjson all
+
+qjson-install qjson-uninstall qjson-clean qjson-distclean:
+ ${MAKE} -C qjson ${@:qjson-%=%}
+
View
4 mythtv/external/nzmqt/src/nzmqt.pro
@@ -34,10 +34,10 @@ LIBS += -lzmq
INCLUDEPATH += \
../include \
- $${PREFIX}/include
+ ../../zeromq/include
QMAKE_LIBDIR += \
- ${{LIBDIR}
+ ../../zeromq/src/.libs
inc.files += ../include/nzmqt/nzmqt.hpp
inc.path = $${PREFIX}/include/

0 comments on commit 9d02591

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