Switch to unified view

a/Makefile.am b/Makefile.am
...
...
13
13
14
if MAKECONFGUI
14
if MAKECONFGUI
15
all-local: qtconfgui
15
all-local: qtconfgui
16
qtconfgui:
16
qtconfgui:
17
    test -d cfgui || mkdir cfgui
17
    test -d cfgui || mkdir cfgui
18
    (cd cfgui; ${QMAKE} PREFIX=${prefix} $(top_srcdir)/cfgui/upmpdcli-config.pro)
18
    (cd cfgui; ${QMAKE} PREFIX=${prefix} upmpdcli-config.pro)
19
    $(MAKE) -C cfgui LFLAGS="$(LDFLAGS)" prefix=$(prefix) \
19
    $(MAKE) -C cfgui LFLAGS="$(LDFLAGS)" prefix=$(prefix) \
20
                exec_prefix=$(exec_prefix) libdir=$(libdir)
20
                exec_prefix=$(exec_prefix) libdir=$(libdir)
21
clean-local: qtconfgui-clean
21
clean-local: qtconfgui-clean
22
qtconfgui-clean:
22
qtconfgui-clean:
23
    -$(MAKE) -C cfgui clean
23
    -$(MAKE) -C cfgui clean
...
...
178
                 src/mediaserver/cdplugins/uprcl/uprclsearch.py \
178
                 src/mediaserver/cdplugins/uprcl/uprclsearch.py \
179
                 src/mediaserver/cdplugins/uprcl/uprcltags.py \
179
                 src/mediaserver/cdplugins/uprcl/uprcltags.py \
180
                 src/mediaserver/cdplugins/uprcl/uprcluntagged.py \
180
                 src/mediaserver/cdplugins/uprcl/uprcluntagged.py \
181
                 src/mediaserver/cdplugins/uprcl/uprclutils.py
181
                 src/mediaserver/cdplugins/uprcl/uprclutils.py
182
182
183
EXTRA_DIST = autogen.sh web.tar.gz rdpl2stream.tar.gz uprclbottle.tar.gz \
183
EXTRA_DIST = \
184
    autogen.sh \
185
    cfgui/Makefile \
186
    cfgui/confgui.cpp \
187
    cfgui/confgui.h \
188
    cfgui/confmain.cpp \
189
    cfgui/mainwindow.h \
190
    cfgui/picoxml.h \
191
    cfgui/upmpdcli-config.pro \
192
    rdpl2stream.tar.gz \
193
    src/conftree.cpp \
194
    src/execmd.cpp \
195
    src/mediaserver/cdplugins/cmdtalk.cpp \
196
    src/netcon.cpp autogen.sh \
184
    systemd/upmpdcli.service \
197
    systemd/upmpdcli.service \
185
    src/conftree.cpp src/execmd.cpp src/mediaserver/cdplugins/cmdtalk.cpp \
198
    uprclbottle.tar.gz \
186
    src/netcon.cpp autogen.sh
199
    web.tar.gz
200
187
201
188
web.tar.gz: bogus
202
web.tar.gz: bogus
189
    if test -d $(srcdir)/web; then \
203
    if test -d $(srcdir)/web; then \
190
           (cd $(srcdir); tar cvzf - web) > web.tar.gz; \
204
           (cd $(srcdir); tar cvzf - web) > web.tar.gz; \
191
        fi
205
        fi
...
...
222
236
223
dist_man1_MANS = man/upmpdcli.1
237
dist_man1_MANS = man/upmpdcli.1
224
238
225
dist-hook:
239
dist-hook:
226
    rm -rf rdpl2stream/__pycache__/
240
    rm -rf rdpl2stream/__pycache__/
227
  test -z "`git status -s | grep -v '??' | grep -v Makefile.am`" 
241
#test -z "`git status -s | grep -v '??' | grep -v Makefile.am`" 
228
  git tag -a upmpdcli-v$(VERSION) -m 'version $(VERSION)'
242
#git tag -a upmpdcli-v$(VERSION) -m 'version $(VERSION)'