Switch to unified view

a/Makefile.am b/Makefile.am
1
AM_CPPFLAGS = -DDEBUG -g -Wall \
1
AM_CPPFLAGS = -DDEBUG -g -Wall \
2
            $(upnpp_CFLAGS) \
2
            $(upnpp_CFLAGS) \
3
            -I$(top_srcdir)/src \
3
            -I$(top_srcdir)/src \
4
            -I$(top_srcdir)/src/mediaserver/cdplugins \
4
            -DDATADIR=\"${pkgdatadir}\" -DCONFIGDIR=\"${sysconfdir}\"
5
            -DDATADIR=\"${pkgdatadir}\" -DCONFIGDIR=\"${sysconfdir}\"
5
6
6
AM_CXXFLAGS = -std=c++11 
7
AM_CXXFLAGS = -std=c++11 
7
8
8
bin_PROGRAMS = upmpdcli scctl
9
bin_PROGRAMS = upmpdcli scctl
10
11
# We import the log facility from libupnpp, which requires fixing
12
# include directives for files which expect to live in the same
13
# directory as log.h
14
BUILT_SOURCES = src/conftree-fixed.cpp src/execmd-fixed.cpp \
15
              src/mediaserver/cdplugins/cmdtalk-fixed.cpp src/netcon-fixed.cpp
16
src/conftree-fixed.cpp : $(top_srcdir)/src/conftree.cpp
17
  sed -e 's;#include "log.h";#include "libupnpp/log.h";' < \
18
      $(top_srcdir)/src/conftree.cpp > src/conftree-fixed.cpp
19
src/execmd-fixed.cpp : $(top_srcdir)/src/execmd.cpp
20
  sed -e 's;#include "log.h";#include "libupnpp/log.h";' < \
21
      $(top_srcdir)/src/execmd.cpp > src/execmd-fixed.cpp
22
src/netcon-fixed.cpp : $(top_srcdir)/src/netcon.cpp
23
  sed -e 's;#include "log.h";#include "libupnpp/log.h";' < \
24
      $(top_srcdir)/src/netcon.cpp > src/netcon-fixed.cpp
25
src/mediaserver/cdplugins/cmdtalk-fixed.cpp : \
26
      $(top_srcdir)/src/mediaserver/cdplugins/cmdtalk.cpp
27
  sed -e 's;#include "log.h";#include "libupnpp/log.h";' < \
28
      $(top_srcdir)/src/mediaserver/cdplugins/cmdtalk.cpp > \
29
      src/mediaserver/cdplugins/cmdtalk-fixed.cpp
30
31
CLEANFILES = $(BUILT_SOURCES)
9
32
10
upmpdcli_SOURCES = \
33
upmpdcli_SOURCES = \
11
     src/avtransport.cxx \
34
     src/avtransport.cxx \
12
     src/avtransport.hxx \
35
     src/avtransport.hxx \
13
     src/closefrom.cpp \
36
     src/closefrom.cpp \
14
     src/closefrom.h \
37
     src/closefrom.h \
15
     src/conf_post.h \
38
     src/conf_post.h \
16
     src/conftree.cpp \
39
     src/conftree-fixed.cpp \
17
     src/conftree.h \
40
     src/conftree.h \
18
     src/conman.cxx \
41
     src/conman.cxx \
19
     src/conman.hxx \
42
     src/conman.hxx \
20
     src/execmd.cpp \
43
     src/execmd-fixed.cpp \
21
     src/execmd.h \
44
     src/execmd.h \
22
     src/httpfs.cxx \
45
     src/httpfs.cxx \
23
     src/httpfs.hxx \
46
     src/httpfs.hxx \
24
     src/main.cxx \
47
     src/main.cxx \
25
     src/main.hxx \
48
     src/main.hxx \
26
     src/mediaserver/cdplugins/cdplugin.hxx \
49
     src/mediaserver/cdplugins/cdplugin.hxx \
27
     src/mediaserver/cdplugins/cmdtalk.cpp \
50
     src/mediaserver/cdplugins/cmdtalk-fixed.cpp \
28
     src/mediaserver/cdplugins/cmdtalk.h \
51
     src/mediaserver/cdplugins/cmdtalk.h \
29
     src/mediaserver/cdplugins/plgwithslave.cxx \
52
     src/mediaserver/cdplugins/plgwithslave.cxx \
30
     src/mediaserver/cdplugins/plgwithslave.hxx \
53
     src/mediaserver/cdplugins/plgwithslave.hxx \
31
     src/mediaserver/contentdirectory.cxx \
54
     src/mediaserver/contentdirectory.cxx \
32
     src/mediaserver/contentdirectory.hxx \
55
     src/mediaserver/contentdirectory.hxx \
33
     src/mediaserver/mediaserver.cxx \
56
     src/mediaserver/mediaserver.cxx \
34
     src/mediaserver/mediaserver.hxx \
57
     src/mediaserver/mediaserver.hxx \
35
     src/mpdcli.cxx \
58
     src/mpdcli.cxx \
36
     src/mpdcli.hxx \
59
     src/mpdcli.hxx \
37
     src/netcon.cpp \
60
     src/netcon-fixed.cpp \
38
     src/netcon.h \
61
     src/netcon.h \
39
     src/ohinfo.cxx \
62
     src/ohinfo.cxx \
40
     src/ohinfo.hxx \
63
     src/ohinfo.hxx \
41
     src/ohmetacache.cxx \
64
     src/ohmetacache.cxx \
42
     src/ohmetacache.hxx \
65
     src/ohmetacache.hxx \
...
...
70
                           
93
                           
71
upmpdcli_LDADD = $(UPMPDCLI_LIBS)
94
upmpdcli_LDADD = $(UPMPDCLI_LIBS)
72
95
73
scctl_SOURCES = \
96
scctl_SOURCES = \
74
    scctl_src/scctl.cpp \
97
    scctl_src/scctl.cpp \
75
    src/netcon.cpp \
98
    src/netcon-fixed.cpp \
76
    src/smallut.cpp \
99
    src/smallut.cpp \
77
    src/upmpdutils.cxx
100
    src/upmpdutils.cxx
78
101
79
scctl_LDADD = $(SCCTL_LIBS)
102
scctl_LDADD = $(SCCTL_LIBS)
80
              
103
              
...
...
133
156
134
bogus:
157
bogus:
135
158
136
install-data-hook: web.tar.gz rdpl2stream.tar.gz
159
install-data-hook: web.tar.gz rdpl2stream.tar.gz
137
    (cd $(DESTDIR)$(sysconfdir); test -f upmpdcli.conf || \
160
    (cd $(DESTDIR)$(sysconfdir); test -f upmpdcli.conf || \
138
         mv upmpdcli.conf-dist upmpdcli.conf)
161
     mv upmpdcli.conf-dist upmpdcli.conf)
139
    (cd $(DESTDIR)$(pkgdatadir); tar xzf -) < web.tar.gz 
162
    (cd $(DESTDIR)$(pkgdatadir); tar xzf -) < web.tar.gz 
140
    (cd $(DESTDIR)$(pkgdatadir); tar xzf -) < rdpl2stream.tar.gz
163
    (cd $(DESTDIR)$(pkgdatadir); tar xzf -) < rdpl2stream.tar.gz
141
    (cd $(DESTDIR)$(pkgdatadir); test -d src_scripts || mkdir src_scripts)
164
    (cd $(DESTDIR)$(pkgdatadir); test -d src_scripts || mkdir src_scripts)
142
    (cd $(DESTDIR)/$(cdpluginstidaldir); chmod a+x tidal-app.py) 
165
    (cd $(DESTDIR)/$(cdpluginstidaldir); chmod a+x tidal-app.py) 
143
    (cd $(DESTDIR)/$(cdpluginsqobuzdir); chmod a+x qobuz-app.py) 
166
    (cd $(DESTDIR)/$(cdpluginsqobuzdir); chmod a+x qobuz-app.py) 
144
    (cd $(DESTDIR)/$(cdpluginsgmusicdir); chmod a+x gmusic-app.py) 
167
    (cd $(DESTDIR)/$(cdpluginsgmusicdir); chmod a+x gmusic-app.py) 
145
168
146
dist_pkgdata_SCRIPTS = samplescripts/Analog-Input
169
dist_pkgdata_SCRIPTS = samplescripts/Analog-Input
147
170
148
dist_sysconf_DATA = src/upmpdcli.conf-dist
171
dist_sysconf_DATA = src/upmpdcli.conf-dist
149
            
172
150
dist_man1_MANS = man/upmpdcli.1
173
dist_man1_MANS = man/upmpdcli.1
151
174
152
dist-hook:
175
dist-hook:
153
    rm -rf rdpl2stream/__pycache__/
176
    rm -rf rdpl2stream/__pycache__/
154
    test -z "`git status -s | grep -v upmpdcli-$(VERSION)| grep -v rdpl2stream.tar.gz`"
177
    test -z "`git status -s | grep -v upmpdcli-$(VERSION)| grep -v rdpl2stream.tar.gz`"