Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

[project] Fixed conditional build of addons. #72

Merged
merged 1 commit into from

2 participants

@fetzerch

First of all: sorry for breaking the build!

I checked the autotools manual fixed the scripts according to their example.
Now all makefiles are built, but the build itself is conditional.
Tested on my linux box with git clean -xfd.

Cheers,
Christian

@opdenkamp
Owner

thank

@opdenkamp opdenkamp merged commit 02102e5 into from
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Oct 27, 2012
  1. @fetzerch
This page is out of date. Refresh to see the latest.
Showing with 32 additions and 37 deletions.
  1. +0 −2  .dummy.am
  2. +6 −2 addons/Makefile.am
  3. +21 −32 configure.ac
  4. +5 −1 lib/Makefile.am
View
2  .dummy.am
@@ -1,2 +0,0 @@
-# Does nothing intentionally.
-# This exists solely so we can use AM_INIT_AUTOMAKE in configure.in
View
8 addons/Makefile.am
@@ -1,12 +1,16 @@
+if ADDON_MYTHTV
+ ADDITIONAL_SUBDIRS = pvr.mythtv.cmyth
+endif
+
SUBDIRS = pvr.demo \
pvr.hts \
pvr.mediaportal.tvserver \
- pvr.mythtv.cmyth \
pvr.nextpvr \
pvr.vdr.vnsi \
pvr.njoy \
pvr.vuplus \
- pvr.fortherecord.argus
+ pvr.fortherecord.argus \
+ $(ADDITIONAL_SUBDIRS)
clean:
-rm -f *.zip
View
53 configure.ac
@@ -145,18 +145,11 @@ if test "$build_addons_with_dependencies" = "yes"; then
use_mysql=no
fi
fi
-
- ### Addons with dependencies
- OUTPUT_FILES_ADDONS_WITH_DEPENDENCIES=""
- if test "$use_mysql" = "yes"; then
- echo "Building additional addon pvr.mythtv.cmyth"
- OUTPUT_FILES_ADDONS_WITH_DEPENDENCIES="lib/cmyth/Makefile \
- lib/cmyth/libcmyth/Makefile \
- lib/cmyth/librefmem/Makefile \
- addons/pvr.mythtv.cmyth/Makefile"
- fi
fi
+### Addons with dependencies
+AM_CONDITIONAL([ADDON_MYTHTV], [test "$build_addons_with_dependencies" = "yes" -a "$use_mysql" = "yes"])
+
### Check for Intree building
if test "x${cross_compiling}" = "xyes" || test "x${cross_compiling}" = "xmaybe"; then
# don't call AC_CHECK_FILE when (maybe) cross-compiling
@@ -205,27 +198,23 @@ else
fi
AC_SUBST(DATADIR)
-OUTPUT_FILES="Makefile \
- lib/Makefile \
- lib/jsoncpp/Makefile \
- lib/libhts/Makefile \
- lib/tinyxml/Makefile \
- addons/Makefile \
- addons/pvr.demo/Makefile \
- addons/pvr.fortherecord.argus/Makefile \
- addons/pvr.hts/Makefile \
- addons/pvr.mediaportal.tvserver/Makefile \
- addons/pvr.nextpvr/Makefile \
- addons/pvr.njoy/Makefile \
- addons/pvr.vuplus/Makefile \
- addons/pvr.vdr.vnsi/Makefile \
- $OUTPUT_FILES_ADDONS_WITH_DEPENDENCIES"
-
-# Line below is used so we can use AM_INIT_AUTOMAKE. The corresponding
-# .dummy.am does nothing.
-AC_CONFIG_FILES([.dummy])
-
-AC_CONFIG_FILES([$OUTPUT_FILES])
-OUTPUT_FILES="$OUTPUT_FILES .dummy"
+AC_CONFIG_FILES([Makefile \
+ lib/Makefile \
+ lib/jsoncpp/Makefile \
+ lib/libhts/Makefile \
+ lib/tinyxml/Makefile \
+ lib/cmyth/Makefile \
+ lib/cmyth/libcmyth/Makefile \
+ lib/cmyth/librefmem/Makefile \
+ addons/Makefile \
+ addons/pvr.demo/Makefile \
+ addons/pvr.fortherecord.argus/Makefile \
+ addons/pvr.hts/Makefile \
+ addons/pvr.mediaportal.tvserver/Makefile \
+ addons/pvr.nextpvr/Makefile \
+ addons/pvr.njoy/Makefile \
+ addons/pvr.vuplus/Makefile \
+ addons/pvr.vdr.vnsi/Makefile \
+ addons/pvr.mythtv.cmyth/Makefile])
AC_OUTPUT
View
6 lib/Makefile.am
@@ -1,4 +1,8 @@
-SUBDIRS = cmyth libhts tinyxml jsoncpp
+if ADDON_MYTHTV
+ ADDITIONAL_SUBDIRS = cmyth
+endif
+
+SUBDIRS = libhts tinyxml jsoncpp $(ADDITIONAL_SUBDIRS)
zip:
Something went wrong with that request. Please try again.