Switch to unified view

a/Makefile.am b/Makefile.am
...
...
8
            -DDATADIR=\"${pkgdatadir}\" -DCONFIGDIR=\"${sysconfdir}\"
8
            -DDATADIR=\"${pkgdatadir}\" -DCONFIGDIR=\"${sysconfdir}\"
9
9
10
AM_CXXFLAGS = -std=c++11 
10
AM_CXXFLAGS = -std=c++11 
11
11
12
bin_PROGRAMS = upmpdcli scctl
12
bin_PROGRAMS = upmpdcli scctl
13
14
if MAKECONFGUI
15
all-local: qtconfgui
16
qtconfgui:
17
  test -d cfgui || mkdir cfgui
18
  (cd cfgui; ${QMAKE} PREFIX=${prefix} $(top_srcdir)/cfgui/upmpdcli-config.pro)
19
  $(MAKE) -C cfgui LFLAGS="$(LDFLAGS)" prefix=$(prefix) \
20
                exec_prefix=$(exec_prefix) libdir=$(libdir)
21
clean-local: qtconfgui-clean
22
qtconfgui-clean:
23
  -$(MAKE) -C cfgui clean
24
install-exec-local: qtconfgui-install
25
qtconfgui-install:
26
  $(MAKE) -C cfgui LFLAGS="$(LDFLAGS)" INSTALL_ROOT=$(DESTDIR) \
27
                prefix=$(prefix) exec_prefix=$(exec_prefix) libdir=$(libdir) \
28
                install
29
endif
13
30
14
# We import the log facility from libupnpp, which requires fixing
31
# We import the log facility from libupnpp, which requires fixing
15
# include directives for files which expect to live in the same
32
# include directives for files which expect to live in the same
16
# directory as log.h
33
# directory as log.h
17
BUILT_SOURCES = src/conftree-fixed.cpp src/execmd-fixed.cpp \
34
BUILT_SOURCES = src/conftree-fixed.cpp src/execmd-fixed.cpp \
...
...
109
dist_pkgdata_DATA = src/description.xml src/AVTransport.xml \
126
dist_pkgdata_DATA = src/description.xml src/AVTransport.xml \
110
                  src/RenderingControl.xml src/ConnectionManager.xml \
127
                  src/RenderingControl.xml src/ConnectionManager.xml \
111
                  src/OHProduct.xml src/OHInfo.xml src/OHTime.xml \
128
                  src/OHProduct.xml src/OHInfo.xml src/OHTime.xml \
112
                  src/OHVolume.xml src/OHPlaylist.xml src/OHReceiver.xml \
129
                  src/OHVolume.xml src/OHPlaylist.xml src/OHReceiver.xml \
113
                  src/OHRadio.xml src/mediaserver/ContentDirectory.xml \
130
                  src/OHRadio.xml src/mediaserver/ContentDirectory.xml \
114
                  src/protocolinfo.txt src/presentation.html
131
                  src/protocolinfo.txt src/presentation.html \
132
                  src/upmpdcli.conf-dist 
115
133
116
cdpluginspycomdir = $(pkgdatadir)/cdplugins/pycommon
134
cdpluginspycomdir = $(pkgdatadir)/cdplugins/pycommon
117
dist_cdpluginspycom_DATA = \
135
dist_cdpluginspycom_DATA = \
118
                    src/mediaserver/cdplugins/pycommon/cmdtalk.py \
136
                    src/mediaserver/cdplugins/pycommon/cmdtalk.py \
119
                    src/mediaserver/cdplugins/pycommon/cmdtalkplugin.py \
137
                    src/mediaserver/cdplugins/pycommon/cmdtalkplugin.py \