Skip to content

Commit 89672e0

Browse files
closes #42
Unfortunately, everyone will need to run configure for this. This includes Mask Spieth's distclean patch and a small fix from Sage at gypsycaravan.com for MythTV to compile with Qt Embedded. This requires a change in the edit, compile, run cycle. Whenever you typed "make distclean" before, you now type "make clean" instead. "make distclean" will really do a distribution ready clean, forcing you to re-run configure... git-svn-id: http://svn.mythtv.org/svn/trunk@6829 7dbf422c-18fa-0310-86e9-fd20926502f2
1 parent debe918 commit 89672e0

File tree

3 files changed

+32
-1
lines changed

3 files changed

+32
-1
lines changed

mythtv/configure

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2612,10 +2612,12 @@ diff $TMPH $MYTH_CONFIG_H >/dev/null 2>&1
26122612
if test $? -ne 0 ; then
26132613
mv -f $TMPH $MYTH_CONFIG_H
26142614
rm -f config.h
2615-
ln -s $MYTH_CONFIG_H config.h
26162615
else
26172616
echo "$MYTH_CONFIG_H is unchanged"
26182617
fi
2618+
if ! test -L config.h ; then
2619+
ln -s $MYTH_CONFIG_H config.h
2620+
fi
26192621

26202622
if [ ! -e config.h ] ; then
26212623
ln -s $MYTH_CONFIG_H config.h
@@ -2624,6 +2626,30 @@ fi
26242626
rm -f config.mak
26252627
ln -s $MYTH_CONFIG_MAK config.mak
26262628

2629+
# Create a special cleanup makefile that will allow make clean to work
2630+
if [ ! -e config ] ; then
2631+
mkdir config
2632+
fi
2633+
cat - > config/Makefile <<END
2634+
2635+
all:
2636+
qmake_all:
2637+
2638+
clean:
2639+
-rm -f ../*/*/*.so*
2640+
-rm -f ../*/*/*.a
2641+
2642+
install:
2643+
uninstall:
2644+
2645+
distclean: clean
2646+
-rm -f ../$MYTH_CONFIG_MAK
2647+
-rm -f ../$MYTH_CONFIG_H
2648+
-rm -f ../config.mak ../config.h
2649+
-rm -f ../Makefile
2650+
2651+
END
2652+
26272653
rm -f $TMPO $TMPC $TMPE $TMPS $TMPH
26282654

26292655
qmake mythtv.pro

mythtv/mythtv.pro

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ include ( settings.pro )
1313

1414
# Directories
1515
SUBDIRS += libs filters programs themes i18n
16+
# clean up config on distclean
17+
SUBDIRS += config
1618

1719
using_frontend {
1820
SUBDIRS += setup

mythtv/settings.pro

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ QMAKE_CXXFLAGS += $$CONFIG_DIRECTFB_CXXFLAGS
2828
QMAKE_CXXFLAGS_SHLIB = -DPIC -fPIC
2929
QMAKE_CXXFLAGS += $$ECXXFLAGS
3030

31+
# Allow compilation with Qt Embedded, if Qt is compiled without "-fno-rtti"
32+
QMAKE_CXXFLAGS -= -fno-exceptions -fno-rtti
33+
3134
QMAKE_CXXFLAGS_RELEASE = $$OPTFLAGS -fomit-frame-pointer
3235
release:contains( TARGET_ARCH_POWERPC, yes ) {
3336
QMAKE_CXXFLAGS_RELEASE = $$OPTFLAGS

0 commit comments

Comments
 (0)