Skip to content

Commit

Permalink
closes #42
Browse files Browse the repository at this point in the history
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
  • Loading branch information
daniel-kristjansson committed Jul 13, 2005
1 parent debe918 commit 89672e0
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 1 deletion.
28 changes: 27 additions & 1 deletion mythtv/configure
Expand Up @@ -2612,10 +2612,12 @@ diff $TMPH $MYTH_CONFIG_H >/dev/null 2>&1
if test $? -ne 0 ; then
mv -f $TMPH $MYTH_CONFIG_H
rm -f config.h
ln -s $MYTH_CONFIG_H config.h
else
echo "$MYTH_CONFIG_H is unchanged"
fi
if ! test -L config.h ; then
ln -s $MYTH_CONFIG_H config.h
fi

if [ ! -e config.h ] ; then
ln -s $MYTH_CONFIG_H config.h
Expand All @@ -2624,6 +2626,30 @@ fi
rm -f config.mak
ln -s $MYTH_CONFIG_MAK config.mak

# Create a special cleanup makefile that will allow make clean to work
if [ ! -e config ] ; then
mkdir config
fi
cat - > config/Makefile <<END
all:
qmake_all:
clean:
-rm -f ../*/*/*.so*
-rm -f ../*/*/*.a
install:
uninstall:
distclean: clean
-rm -f ../$MYTH_CONFIG_MAK
-rm -f ../$MYTH_CONFIG_H
-rm -f ../config.mak ../config.h
-rm -f ../Makefile
END

rm -f $TMPO $TMPC $TMPE $TMPS $TMPH

qmake mythtv.pro
2 changes: 2 additions & 0 deletions mythtv/mythtv.pro
Expand Up @@ -13,6 +13,8 @@ include ( settings.pro )

# Directories
SUBDIRS += libs filters programs themes i18n
# clean up config on distclean
SUBDIRS += config

using_frontend {
SUBDIRS += setup
Expand Down
3 changes: 3 additions & 0 deletions mythtv/settings.pro
Expand Up @@ -28,6 +28,9 @@ QMAKE_CXXFLAGS += $$CONFIG_DIRECTFB_CXXFLAGS
QMAKE_CXXFLAGS_SHLIB = -DPIC -fPIC
QMAKE_CXXFLAGS += $$ECXXFLAGS

# Allow compilation with Qt Embedded, if Qt is compiled without "-fno-rtti"
QMAKE_CXXFLAGS -= -fno-exceptions -fno-rtti

QMAKE_CXXFLAGS_RELEASE = $$OPTFLAGS -fomit-frame-pointer
release:contains( TARGET_ARCH_POWERPC, yes ) {
QMAKE_CXXFLAGS_RELEASE = $$OPTFLAGS
Expand Down

0 comments on commit 89672e0

Please sign in to comment.