Switch to unified view

a/Makefile.am b/Makefile.am
1
AM_CPPFLAGS = -DDEBUG -g -Wall \
1
AM_CPPFLAGS = -DDEBUG -g -Wall \
2
            -I${prefix}/include/libupnpp \
2
            -I${prefix}/include/libupnpp \
3
            -I$(top_srcdir)/src \
3
            -I$(top_srcdir)/src \
4
            -I$(top_srcdir)/src/cdplugins \
5
            -DDATADIR=\"${pkgdatadir}\" -DCONFIGDIR=\"${sysconfdir}\"
4
            -DDATADIR=\"${pkgdatadir}\" -DCONFIGDIR=\"${sysconfdir}\"
6
5
7
AM_CXXFLAGS = -std=c++11 
6
AM_CXXFLAGS = -std=c++11 
8
7
9
bin_PROGRAMS = upmpdcli scctl
8
bin_PROGRAMS = upmpdcli scctl
10
9
11
upmpdcli_SOURCES = \
10
upmpdcli_SOURCES = \
12
     src/avtransport.cxx \
11
     src/avtransport.cxx \
13
     src/avtransport.hxx \
12
     src/avtransport.hxx \
14
     src/cdplugin.hxx \
15
     src/cdplugins/cmdtalk.cpp \
16
     src/cdplugins/cmdtalk.h \
17
     src/cdplugins/json/json-forwards.h \
18
     src/cdplugins/json/json.h \
19
     src/cdplugins/jsoncpp.cpp \
20
     src/cdplugins/plgwithslave.cxx \
21
     src/cdplugins/plgwithslave.hxx \
22
     src/closefrom.cpp \
13
     src/closefrom.cpp \
23
     src/closefrom.h \
14
     src/closefrom.h \
24
     src/conf_post.h \
15
     src/conf_post.h \
25
     src/conftree.cpp \
16
     src/conftree.cpp \
26
     src/conftree.h \
17
     src/conftree.h \
27
     src/conman.cxx \
18
     src/conman.cxx \
28
     src/conman.hxx \
19
     src/conman.hxx \
29
     src/contentdirectory.cxx \
30
     src/contentdirectory.hxx \
31
     src/execmd.cpp \
20
     src/execmd.cpp \
32
     src/execmd.h \
21
     src/execmd.h \
33
     src/httpfs.cxx \
22
     src/httpfs.cxx \
34
     src/httpfs.hxx \
23
     src/httpfs.hxx \
24
     src/main.cxx \
35
     src/main.hxx \
25
     src/main.hxx \
36
     src/main.cxx \
37
     src/mediaserver.cxx \
38
     src/mediaserver.hxx \
26
     src/mediaserver/cdplugin.hxx \
27
     src/mediaserver/cdplugins/cmdtalk.cpp \
28
     src/mediaserver/cdplugins/cmdtalk.h \
29
     src/mediaserver/cdplugins/json/json-forwards.h \
30
     src/mediaserver/cdplugins/json/json.h \
31
     src/mediaserver/cdplugins/jsoncpp.cpp \
32
     src/mediaserver/cdplugins/plgwithslave.cxx \
33
     src/mediaserver/cdplugins/plgwithslave.hxx \
34
     src/mediaserver/contentdirectory.cxx \
35
     src/mediaserver/contentdirectory.hxx \
36
     src/mediaserver/mediaserver.cxx \
37
     src/mediaserver/mediaserver.hxx \
39
     src/mpdcli.cxx \
38
     src/mpdcli.cxx \
40
     src/mpdcli.hxx \
39
     src/mpdcli.hxx \
41
     src/netcon.cpp \
40
     src/netcon.cpp \
42
     src/netcon.h \
41
     src/netcon.h \
43
     src/ohinfo.cxx \
42
     src/ohinfo.cxx \
...
...
84
              
83
              
85
dist_pkgdata_DATA = src/description.xml src/AVTransport.xml \
84
dist_pkgdata_DATA = src/description.xml src/AVTransport.xml \
86
                  src/RenderingControl.xml src/ConnectionManager.xml \
85
                  src/RenderingControl.xml src/ConnectionManager.xml \
87
                  src/OHProduct.xml src/OHInfo.xml src/OHTime.xml \
86
                  src/OHProduct.xml src/OHInfo.xml src/OHTime.xml \
88
                  src/OHVolume.xml src/OHPlaylist.xml src/OHReceiver.xml \
87
                  src/OHVolume.xml src/OHPlaylist.xml src/OHReceiver.xml \
89
                  src/OHRadio.xml src/ContentDirectory.xml \
88
                  src/OHRadio.xml src/mediaserver/ContentDirectory.xml \
90
                  src/protocolinfo.txt src/presentation.html
89
                  src/protocolinfo.txt src/presentation.html
91
90
92
cdpluginspycomdir = $(pkgdatadir)/cdplugins/pycommon
91
cdpluginspycomdir = $(pkgdatadir)/cdplugins/pycommon
93
dist_cdpluginspycom_DATA = \
92
dist_cdpluginspycom_DATA = \
94
                    src/cdplugins/pycommon/cmdtalk.py \
93
                    src/mediaserver/cdplugins/pycommon/cmdtalk.py \
95
                    src/cdplugins/pycommon/cmdtalkplugin.py \
94
                    src/mediaserver/cdplugins/pycommon/cmdtalkplugin.py \
96
                    src/cdplugins/pycommon/conftree.py \
95
                    src/mediaserver/cdplugins/pycommon/conftree.py \
97
                    src/cdplugins/pycommon/routing.py \
96
                    src/mediaserver/cdplugins/pycommon/routing.py \
98
                    src/cdplugins/pycommon/upmplgmodels.py \
97
                    src/mediaserver/cdplugins/pycommon/upmplgmodels.py \
99
                    src/cdplugins/pycommon/upmplgutils.py
98
                    src/mediaserver/cdplugins/pycommon/upmplgutils.py
100
99
101
cdpluginstidaldir = $(pkgdatadir)/cdplugins/tidal
100
cdpluginstidaldir = $(pkgdatadir)/cdplugins/tidal
102
dist_cdpluginstidal_DATA = \
101
dist_cdpluginstidal_DATA = \
103
                  src/cdplugins/tidal/tidal-app.py 
102
                  src/mediaserver/cdplugins/tidal/tidal-app.py 
104
cdpluginstidallibdir = $(pkgdatadir)/cdplugins/tidal/tidalapi
103
cdpluginstidallibdir = $(pkgdatadir)/cdplugins/tidal/tidalapi
105
dist_cdpluginstidallib_DATA = \
104
dist_cdpluginstidallib_DATA = \
106
                  src/cdplugins/tidal/tidalapi/__init__.py \
105
                  src/mediaserver/cdplugins/tidal/tidalapi/__init__.py \
107
                  src/cdplugins/tidal/tidalapi/models.py
106
                  src/mediaserver/cdplugins/tidal/tidalapi/models.py
108
107
109
cdpluginsqobuzdir = $(pkgdatadir)/cdplugins/qobuz
108
cdpluginsqobuzdir = $(pkgdatadir)/cdplugins/qobuz
110
dist_cdpluginsqobuz_DATA = \
109
dist_cdpluginsqobuz_DATA = \
111
                  src/cdplugins/qobuz/debug.py  \
110
                  src/mediaserver/cdplugins/qobuz/debug.py  \
112
                  src/cdplugins/qobuz/exception.py \
111
                  src/mediaserver/cdplugins/qobuz/exception.py \
113
                  src/cdplugins/qobuz/__init__.py \
112
                  src/mediaserver/cdplugins/qobuz/__init__.py \
114
                  src/cdplugins/qobuz/qobuz-app.py \
113
                  src/mediaserver/cdplugins/qobuz/qobuz-app.py \
115
                  src/cdplugins/qobuz/session.py 
114
                  src/mediaserver/cdplugins/qobuz/session.py 
116
cdpluginsqobuzlibdir = $(pkgdatadir)/cdplugins/qobuz/api
115
cdpluginsqobuzlibdir = $(pkgdatadir)/cdplugins/qobuz/api
117
dist_cdpluginsqobuzlib_DATA = \
116
dist_cdpluginsqobuzlib_DATA = \
118
                  src/cdplugins/qobuz/api/easy.py \
117
                  src/mediaserver/cdplugins/qobuz/api/easy.py \
119
                  src/cdplugins/qobuz/api/__init__.py \
118
                  src/mediaserver/cdplugins/qobuz/api/__init__.py \
120
                  src/cdplugins/qobuz/api/raw.py
119
                  src/mediaserver/cdplugins/qobuz/api/raw.py
121
120
122
cdpluginsgmusicdir = $(pkgdatadir)/cdplugins/gmusic
121
cdpluginsgmusicdir = $(pkgdatadir)/cdplugins/gmusic
123
dist_cdpluginsgmusic_DATA = \
122
dist_cdpluginsgmusic_DATA = \
124
                  src/cdplugins/gmusic/gmusic-app.py \
123
                  src/mediaserver/cdplugins/gmusic/gmusic-app.py \
125
                  src/cdplugins/gmusic/session.py 
124
                  src/mediaserver/cdplugins/gmusic/session.py 
126
125
127
EXTRA_DIST = web.tar.gz rdpl2stream.tar.gz systemd/upmpdcli.service
126
EXTRA_DIST = web.tar.gz rdpl2stream.tar.gz systemd/upmpdcli.service
128
127
129
web.tar.gz: bogus
128
web.tar.gz: bogus
130
    if test -d $(srcdir)/web; then \
129
    if test -d $(srcdir)/web; then \