Index: libs/libmythtv/libmythtv.pro
===================================================================
--- libs/libmythtv/libmythtv.pro	(revision 17354)
+++ libs/libmythtv/libmythtv.pro	(working copy)
@@ -28,12 +28,12 @@
 DEPENDPATH  += ../libmythlivemedia/UsageEnvironment
 
 LIBS += -L../libmyth -L../libavutil -L../libavcodec -L../libavformat 
-LIBS += -L../libmythui -L../libmythupnp
+!combine-libmyth: LIBS += -L../libmythui -L../libmythupnp
 LIBS += -L../libmythmpeg2 -L../libmythdvdnav
 LIBS += -L../libmythfreemheg -L../libmythlivemedia
 LIBS += -lmyth-$$LIBVERSION         -lmythavutil-$$LIBVERSION
 LIBS += -lmythavcodec-$$LIBVERSION  -lmythavformat-$$LIBVERSION
-LIBS += -lmythui-$$LIBVERSION       -lmythupnp-$$LIBVERSION
+!combine-libmyth: LIBS += -lmythui-$$LIBVERSION       -lmythupnp-$$LIBVERSION
 LIBS += -lmythmpeg2-$$LIBVERSION    -lmythdvdnav-$$LIBVERSION
 LIBS += -lmythfreemheg-$$LIBVERSION -lmythlivemedia-$$LIBVERSION
 LIBS += -lz $$EXTRA_LIBS
===================================================================
--- libs/libs.pro	(revision 17354)
+++ libs/libs.pro	(working copy)
@@ -8,8 +8,9 @@
 SUBDIRS += libmythsoundtouch libmythmpeg2 libmythdvdnav
 SUBDIRS += libmythfreesurround
 
-mingw : SUBDIRS += libmyth libmythupnp libmythui
-!mingw: SUBDIRS += libmythupnp libmythui libmyth
+combine-libmyth        : SUBDIRS += libmyth
+!combine-libmyth:mingw : SUBDIRS += libmyth libmythupnp libmythui
+!combine-libmyth:!mingw: SUBDIRS += libmythupnp libmythui libmyth
 
 SUBDIRS += libmythfreemheg libmythlivemedia
 
Index: libs/libmyth/libmyth.pro
===================================================================
--- libs/libmyth/libmyth.pro	(revision 17354)
+++ libs/libmyth/libmyth.pro	(working copy)
@@ -1,9 +1,9 @@
 include ( ../../config.mak )
 include ( ../../settings.pro )
- 
+
 TEMPLATE = lib
 TARGET = myth-$$LIBVERSION
-CONFIG += thread dll
+CONFIG += thread dll debug
 target.path = $${LIBDIR}
 INSTALLS = target
 
@@ -56,8 +56,8 @@
 
 LIBS += -L../libmythsamplerate   -lmythsamplerate-$${LIBVERSION}
 LIBS += -L../libmythsoundtouch   -lmythsoundtouch-$${LIBVERSION}
-LIBS += -L../libmythui           -lmythui-$${LIBVERSION}
-LIBS += -L../libmythupnp         -lmythupnp-$${LIBVERSION}
+!combine-libmyth: LIBS += -L../libmythui           -lmythui-$${LIBVERSION}
+!combine-libmyth: LIBS += -L../libmythupnp         -lmythupnp-$${LIBVERSION}
 LIBS += -L../libmythfreesurround -lmythfreesurround-$${LIBVERSION}
 LIBS += -L../libavcodec          -lmythavcodec-$${LIBVERSION}
 LIBS += -L../libavutil           -lmythavutil-$${LIBVERSION}
@@ -113,7 +113,8 @@
 
     # For easier debugging:
     target.path = $${PREFIX}/bin
-
+ 
+  !combine-libmyth {
     LIBS -= -lmythui-$$LIBVERSION  -lmythupnp-$$LIBVERSION 
     LIBS += -L. -lmythui-bootstrap -lmythupnp-bootstrap
     POST_TARGETDEPS += libmythui-bootstrap.a libmythupnp-bootstrap.a
@@ -128,6 +129,7 @@
                        --dllname libmythupnp-$${LIBVERSION}.dll \
                        --output-lib $$implib2.target  -k
     QMAKE_EXTRA_WIN_TARGETS += implib implib2
+  }
 }
 
 macx {
@@ -248,3 +250,144 @@
 
 #The following line was inserted by qt3to4
 QT += network xml opengl sql qt3support
+
+
+combine-libmyth {
+    # ../libmythupnp/libmythupnp.pro
+
+    include (../../version.pro)
+
+    setting.path = $${PREFIX}/share/mythtv/
+    setting.files += CDS_scpd.xml CMGR_scpd.xml MSRR_scpd.xml MXML_scpd.xml
+
+    INSTALLS += setting
+
+    HEADERS3 += httprequest.h upnp.h ssdp.h taskqueue.h  
+    HEADERS3 += upnpdevice.h upnptasknotify.h upnptasksearch.h threadpool.h upnputil.h
+    HEADERS3 += httpserver.h upnpcds.h upnpcdsobjects.h bufferedsocketdevice.h upnpmsrr.h
+    HEADERS3 += eventing.h upnpcmgr.h upnptaskevent.h upnptaskcache.h ssdpcache.h
+    HEADERS3 += upnpimpl.h multicast.h broadcast.h configuration.h
+    HEADERS3 += soapclient.h mythxmlclient.h
+
+    SOURCES3 += httprequest.cpp upnp.cpp ssdp.cpp taskqueue.cpp upnputil.cpp
+    SOURCES3 += upnpdevice.cpp upnptasknotify.cpp upnptasksearch.cpp threadpool.cpp
+    SOURCES3 += httpserver.cpp upnpcds.cpp upnpcdsobjects.cpp bufferedsocketdevice.cpp
+    SOURCES3 += eventing.cpp upnpcmgr.cpp upnpmsrr.cpp upnptaskevent.cpp ssdpcache.cpp
+    SOURCES3 += configuration.cpp soapclient.cpp mythxmlclient.cpp
+
+    LIBS += $$EXTRA_LIBS
+
+    mingw {
+        TARGET = lib$${TARGET}
+
+        # For easier debugging:
+        target.path = $${PREFIX}/bin
+
+        HEADERS3 += darwin-sendfile.h
+        SOURCES3 += darwin-sendfile.c
+
+        LIBS += -lws2_32
+    }
+
+    inc3.path = $${PREFIX}/include/mythtv/upnp/
+
+    inc3.files  = httprequest.h upnp.h ssdp.h taskqueue.h bufferedsocketdevice.h
+    inc3.files += upnpdevice.h upnptasknotify.h upnptasksearch.h threadpool.h upnputil.h
+    inc3.files += httpserver.h httpstatus.h upnpcds.h upnpcdsobjects.h
+    inc3.files += eventing.h upnpcmgr.h upnptaskevent.h upnptaskcache.h ssdpcache.h
+    inc3.files += upnpimpl.h multicast.h broadcast.h configuration.h
+    inc3.files += soapclient.h mythxmlclient.h
+
+    INSTALLS += inc3
+
+    cygwin:HEADERS3 += darwin-sendfile.h
+    cygwin:SOURCES3 += darwin-sendfile.c
+
+    freebsd:HEADERS3 += darwin-sendfile.h 
+    freebsd:SOURCES3 += darwin-sendfile.c 
+
+    macx {
+        HEADERS3 += darwin-sendfile.h
+        SOURCES3 += darwin-sendfile.c
+
+        QMAKE_LFLAGS_SHLIB += -flat_namespace
+    }
+
+
+
+
+    # ../libmythui/libmythui.pro
+
+    HEADERS4  = mythmainwindow.h mythpainter.h mythimage.h myththemebase.h
+    HEADERS4 += mythpainter_qt.h mythmainwindow_internal.h
+    HEADERS4 += mythscreenstack.h mythscreentype.h mythuitype.h mythuiimage.h 
+    HEADERS4 += mythuitext.h mythuistatetype.h mythgesture.h xmlparsebase.h
+    HEADERS4 += mythuibutton.h mythlistbutton.h myththemedmenu.h mythdialogbox.h
+    HEADERS4 += mythuiclock.h mythuitextedit.h mythprogressdialog.h mythuispinbox.h
+
+    SOURCES4  = mythmainwindow.cpp mythpainter.cpp mythimage.cpp myththemebase.cpp
+    SOURCES4 += mythpainter_qt.cpp xmlparsebase.cpp
+    SOURCES4 += mythscreenstack.cpp mythscreentype.cpp mythgesture.cpp
+    SOURCES4 += mythuitype.cpp mythuiimage.cpp mythuitext.cpp
+    SOURCES4 += mythuistatetype.cpp mythlistbutton.cpp mythfontproperties.cpp
+    SOURCES4 += mythuibutton.cpp myththemedmenu.cpp mythdialogbox.cpp
+    SOURCES4 += mythuiclock.cpp mythuitextedit.cpp mythprogressdialog.cpp
+    SOURCES4 += mythuispinbox.cpp
+
+    inc4.path = $${PREFIX}/include/mythtv/libmythui/
+
+    inc4.files  = mythmainwindow.h mythpainter.h mythimage.h myththemebase.h
+    inc4.files += mythpainter_qt.h mythuistatetype.h
+    inc4.files += mythscreenstack.h mythscreentype.h mythuitype.h mythuiimage.h 
+    inc4.files += mythuitext.h mythuibutton.h mythlistbutton.h xmlparsebase.h
+    inc4.files += myththemedmenu.h mythdialogbox.h mythfontproperties.h
+    inc4.files += mythuiclock.h mythgesture.h mythuitextedit.h mythprogressdialog.h
+    inc4.files += mythuispinbox.h
+
+    INSTALLS += inc4
+
+    using_x11:using_opengl {
+        DEFINES += USE_OPENGL_PAINTER
+        SOURCES4 += mythpainter_ogl.cpp
+        HEADERS4 += mythpainter_ogl.h
+        inc4.files += mythpainter_ogl.h
+        LIBS += $$EXTRA_LIBS
+    }
+
+    macx {
+        QMAKE_CXXFLAGS += -F/System/Library/Frameworks/Carbon.framework/Frameworks
+        LIBS           += -framework Carbon -framework OpenGL
+
+        QMAKE_LFLAGS_SHLIB += -flat_namespace
+    }
+
+    using_joystick_menu {
+        DEFINES += USE_JOYSTICK_MENU
+    }
+
+    using_lirc {
+        DEFINES += USE_LIRC
+    }
+
+    cygwin:DEFINES += _WIN32
+
+    mingw {
+        TARGET = lib$${TARGET}
+
+        # For easier debugging:
+        target.path = $${PREFIX}/bin
+
+        using_opengl {
+            LIBS += -lopengl32
+            DEFINES += USE_OPENGL_PAINTER
+            SOURCES4 += mythpainter_ogl.cpp
+            HEADERS4 += mythpainter_ogl.h
+            inc4.files += mythpainter_ogl.h
+        }
+    }
+
+    HEADERS += $$join(HEADERS3, ' ', '../libmythupnp/')
+    HEADERS += $$join(HEADERS4, ' ', '../libmythui/')
+    SOURCES += $$join(SOURCES3, ' ', '../libmythupnp/')
+    SOURCES += $$join(SOURCES4, ' ', '../libmythui/')
+}
Index: programs/programs-libs.pro
===================================================================
--- programs/programs-libs.pro	(revision 17354)
+++ programs/programs-libs.pro	(working copy)
@@ -1,3 +1,5 @@
+include ( ../settings.pro )
+
 INCLUDEPATH += ../.. ../../libs/ ../../libs/libmyth ../../libs/libmythtv
 INCLUDEPATH += ../../libs/libavutil ../../libs/libavformat ../../libs/libavcodec
 INCLUDEPATH += ../../libs/libmythupnp ../../libs/libmythui
@@ -6,28 +8,29 @@
 LIBS += -L../../libs/libmyth -L../../libs/libmythtv
 LIBS += -L../../libs/libavutil -L../../libs/libavcodec -L../../libs/libavformat
 LIBS += -L../../libs/libmythfreemheg
-LIBS += -L../../libs/libmythui
-LIBS += -L../../libs/libmythupnp
+!combine-libmyth: LIBS += -L../../libs/libmythui
+!combine-libmyth: LIBS += -L../../libs/libmythupnp
 LIBS += -L../../libs/libmythlivemedia
 
 LIBS += -lmythtv-$$LIBVERSION -lmythavformat-$$LIBVERSION
 LIBS += -lmythavutil-$$LIBVERSION -lmythavcodec-$$LIBVERSION 
 LIBS += -lmythfreemheg-$$LIBVERSION
-LIBS += -lmythupnp-$$LIBVERSION 
+!combine-libmyth: LIBS += -lmythui-$$LIBVERSION
+!combine-libmyth: LIBS += -lmythupnp-$$LIBVERSION 
 LIBS += -lmythlivemedia-$$LIBVERSION
-LIBS += -lmyth-$$LIBVERSION -lmythui-$$LIBVERSION $$EXTRA_LIBS
+LIBS += -lmyth-$$LIBVERSION $$EXTRA_LIBS
 mingw {
     LIBS += -lpthread
     CONFIG += console
 }
 
-TARGETDEPS += ../../libs/libmythui/libmythui-$${MYTH_SHLIB_EXT}
+!combine-libmyth: TARGETDEPS += ../../libs/libmythui/libmythui-$${MYTH_SHLIB_EXT}
 TARGETDEPS += ../../libs/libmyth/libmyth-$${MYTH_SHLIB_EXT}
 TARGETDEPS += ../../libs/libmythtv/libmythtv-$${MYTH_SHLIB_EXT}
 TARGETDEPS += ../../libs/libavutil/libmythavutil-$${MYTH_SHLIB_EXT}
 TARGETDEPS += ../../libs/libavcodec/libmythavcodec-$${MYTH_SHLIB_EXT}
 TARGETDEPS += ../../libs/libavformat/libmythavformat-$${MYTH_SHLIB_EXT}
-TARGETDEPS += ../../libs/libmythupnp/libmythupnp-$${MYTH_SHLIB_EXT}
+!combine-libmyth: TARGETDEPS += ../../libs/libmythupnp/libmythupnp-$${MYTH_SHLIB_EXT}
 using_live: TARGETDEPS += ../../libs/libmythlivemedia/libmythlivemedia-$${MYTH_SHLIB_EXT}
 
 DEPENDPATH += ../.. ../../libs ../../libs/libmyth ../../libs/libmythtv
Index: settings.pro
===================================================================
--- settings.pro	(revision 17354)
+++ settings.pro	(working copy)
@@ -7,6 +7,8 @@
 LIBVERSION = 0.22
 VERSION = 0.22.0
 
+CONFIG += combine-libmyth
+
 isEmpty(TARGET_OS) : win32 {
     CONFIG += mingw
     DEFINES += USING_MINGW USING_WINAUDIO USING_D3D USING_DIRECTX
Index: filters/kerneldeint/kerneldeint.pro
===================================================================
--- filters/kerneldeint/kerneldeint.pro	(revision 17354)
+++ filters/kerneldeint/kerneldeint.pro	(working copy)
@@ -4,8 +4,10 @@
 INCLUDEPATH += ../../libs
 
 LIBS += -lmyth-$${LIBVERSION} -L../../libs/libmyth
+!combine-libmyth {
 macx:LIBS += -lmythui-$${LIBVERSION} -L../../libs/libmythui
 macx:LIBS += -lmythupnp-$${LIBVERSION} -L../../libs/libmythupnp
+}
 
 # Input
 SOURCES += filter_kerneldeint.c