Diff of /Makefile.am [7b3951] .. [2bb2f6]

  Switch to unified view

a/Makefile.am b/Makefile.am
1 
AM_CPPFLAGS = -DDEBUG -g -Wall \
1 
AM_CPPFLAGS = -DDEBUG -g -Wall \


  2
  
      -DMDU_INCLUDE_LOG='<libupnpp/log.h>' \






  2
  
            $(upnpp_CFLAGS) \


  3
  
            $(upnpp_CFLAGS) \






  3
  
            -I$(includedir)/libupnpp \


  
  





  4
  
            $(libmpdclient_CFLAGS) \


  4
  
            $(libmpdclient_CFLAGS) \






  5
  
            $(libmicrohttpd_CFLAGS) \


  5
  
            $(libmicrohttpd_CFLAGS) \






  6
  
            $(jsoncpp_CFLAGS) \


  6
  
            $(jsoncpp_CFLAGS) \






  7
  
            -I$(top_srcdir)/src \


  7
  
            -I$(top_srcdir)/src \






  8
  
            -I$(top_srcdir)/src/mediaserver/cdplugins \


  8
  
            -I$(top_srcdir)/src/mediaserver/cdplugins \






  
  
...

  
  
...





  27
  
    $(MAKE) -C cfgui LFLAGS="$(LDFLAGS)" INSTALL_ROOT=$(DESTDIR) \


  27
  
    $(MAKE) -C cfgui LFLAGS="$(LDFLAGS)" INSTALL_ROOT=$(DESTDIR) \






  28
  
                prefix=$(prefix) exec_prefix=$(exec_prefix) libdir=$(libdir) \


  28
  
                prefix=$(prefix) exec_prefix=$(exec_prefix) libdir=$(libdir) \






  29
  
                install


  29
  
                install






  30
  
endif


  30
  
endif






  31
  

  31
  





  32
  
# We import the log facility from libupnpp, which requires fixing


  
  





  33
  
# include directives for files which expect to live in the same


  
  





  34
  
# directory as log.h


  
  





  35
  
BUILT_SOURCES = src/conftree-fixed.cpp src/execmd-fixed.cpp \


  
  





  36
  
              src/mediaserver/cdplugins/cmdtalk-fixed.cpp \


  
  





  37
  
              src/netcon-fixed.cpp src/sysvshm-fixed.cpp


  
  





  38
  
src/conftree-fixed.cpp : $(top_srcdir)/src/conftree.cpp


  
  





  39
  
  sed -e 's;#include "log.h";#include "libupnpp/log.h";' < \


  
  





  40
  
      $(top_srcdir)/src/conftree.cpp > src/conftree-fixed.cpp


  
  





  41
  
src/execmd-fixed.cpp : $(top_srcdir)/src/execmd.cpp


  
  





  42
  
  sed -e 's;#include "log.h";#include "libupnpp/log.h";' < \


  
  





  43
  
      $(top_srcdir)/src/execmd.cpp > src/execmd-fixed.cpp


  
  





  44
  
src/netcon-fixed.cpp : $(top_srcdir)/src/netcon.cpp


  
  





  45
  
  sed -e 's;#include "log.h";#include "libupnpp/log.h";' < \


  
  





  46
  
      $(top_srcdir)/src/netcon.cpp > src/netcon-fixed.cpp


  
  





  47
  
src/sysvshm-fixed.cpp : $(top_srcdir)/src/sysvshm.cpp


  
  





  48
  
  sed -e 's;#include "log.h";#include "libupnpp/log.h";' < \


  
  





  49
  
      $(top_srcdir)/src/sysvshm.cpp > src/sysvshm-fixed.cpp


  
  





  50
  
src/mediaserver/cdplugins/cmdtalk-fixed.cpp : \


  
  





  51
  
      $(top_srcdir)/src/mediaserver/cdplugins/cmdtalk.cpp


  
  





  52
  
  sed -e 's;#include "log.h";#include "libupnpp/log.h";' < \


  
  





  53
  
      $(top_srcdir)/src/mediaserver/cdplugins/cmdtalk.cpp > \


  
  





  54
  
      src/mediaserver/cdplugins/cmdtalk-fixed.cpp


  
  





  55
  

  
  





  56
  
CLEANFILES = $(BUILT_SOURCES)


  32
  
CLEANFILES = $(BUILT_SOURCES)






  57
  

  33
  





  58
  
upmpdcli_SOURCES = \


  34
  
upmpdcli_SOURCES = \






  59
  
     src/avtransport.cxx \


  35
  
     src/avtransport.cxx \






  60
  
     src/avtransport.hxx \


  36
  
     src/avtransport.hxx \






  61
  
     src/chrono.cpp \


  37
  
     src/chrono.cpp \






  62
  
     src/chrono.h \


  38
  
     src/chrono.h \






  63
  
     src/closefrom.cpp \


  39
  
     src/closefrom.cpp \






  64
  
     src/closefrom.h \


  40
  
     src/closefrom.h \






  65
  
     src/conf_post.h \


  41
  
     src/conf_post.h \






  66
  
     src/conftree-fixed.cpp \


  42
  
     src/conftree.cpp \






  67
  
     src/conftree.h \


  43
  
     src/conftree.h \






  68
  
     src/conman.cxx \


  44
  
     src/conman.cxx \






  69
  
     src/conman.hxx \


  45
  
     src/conman.hxx \






  70
  
     src/execmd-fixed.cpp \


  46
  
     src/execmd.cpp \






  71
  
     src/execmd.h \


  47
  
     src/execmd.h \






  72
  
     src/main.cxx \


  48
  
     src/main.cxx \






  73
  
     src/main.hxx \


  49
  
     src/main.hxx \






  74
  
     src/mediaserver/cdplugins/abuffer.h \


  50
  
     src/mediaserver/cdplugins/abuffer.h \






  75
  
     src/mediaserver/cdplugins/bufxchange.h \


  51
  
     src/mediaserver/cdplugins/bufxchange.h \






  76
  
     src/mediaserver/cdplugins/cdplugin.hxx \


  52
  
     src/mediaserver/cdplugins/cdplugin.hxx \






  77
  
     src/mediaserver/cdplugins/cmdtalk-fixed.cpp \


  53
  
     src/mediaserver/cdplugins/cmdtalk.cpp \






  78
  
     src/mediaserver/cdplugins/cmdtalk.h \


  54
  
     src/mediaserver/cdplugins/cmdtalk.h \






  79
  
     src/mediaserver/cdplugins/curlfetch.cpp \


  55
  
     src/mediaserver/cdplugins/curlfetch.cpp \






  80
  
     src/mediaserver/cdplugins/curlfetch.h \


  56
  
     src/mediaserver/cdplugins/curlfetch.h \






  81
  
     src/mediaserver/cdplugins/netfetch.cpp \


  57
  
     src/mediaserver/cdplugins/netfetch.cpp \






  82
  
     src/mediaserver/cdplugins/netfetch.h \


  58
  
     src/mediaserver/cdplugins/netfetch.h \






  
  
...

  
  
...





  88
  
     src/mediaserver/contentdirectory.hxx \


  64
  
     src/mediaserver/contentdirectory.hxx \






  89
  
     src/mediaserver/mediaserver.cxx \


  65
  
     src/mediaserver/mediaserver.cxx \






  90
  
     src/mediaserver/mediaserver.hxx \


  66
  
     src/mediaserver/mediaserver.hxx \






  91
  
     src/mpdcli.cxx \


  67
  
     src/mpdcli.cxx \






  92
  
     src/mpdcli.hxx \


  68
  
     src/mpdcli.hxx \






  93
  
     src/netcon-fixed.cpp \


  69
  
     src/netcon.cpp \






  94
  
     src/netcon.h \


  70
  
     src/netcon.h \






  95
  
     src/ohcredentials.cxx \


  71
  
     src/ohcredentials.cxx \






  96
  
     src/ohcredentials.hxx \


  72
  
     src/ohcredentials.hxx \






  97
  
     src/ohinfo.cxx \


  73
  
     src/ohinfo.cxx \






  98
  
     src/ohinfo.hxx \


  74
  
     src/ohinfo.hxx \






  
  
...

  
  
...





  121
  
     src/readfile.h \


  97
  
     src/readfile.h \






  122
  
     src/renderctl.cxx \


  98
  
     src/renderctl.cxx \






  123
  
     src/renderctl.hxx \


  99
  
     src/renderctl.hxx \






  124
  
     src/smallut.cpp \


  100
  
     src/smallut.cpp \






  125
  
     src/smallut.h \


  101
  
     src/smallut.h \






  126
  
     src/sysvshm-fixed.cpp \


  102
  
     src/sysvshm.cpp \






  127
  
     src/sysvshm.h \


  103
  
     src/sysvshm.h \






  128
  
     src/upmpd.cxx \


  104
  
     src/upmpd.cxx \






  129
  
     src/upmpd.hxx \


  105
  
     src/upmpd.hxx \






  130
  
     src/upmpdutils.cxx \


  106
  
     src/upmpdutils.cxx \






  131
  
     src/upmpdutils.hxx


  107
  
     src/upmpdutils.hxx \






  
  

  108
  
     src/workqueue.h






  132
  

  109
  





  133
  
upmpdcli_LDADD = $(UPMPDCLI_LIBS)


  110
  
upmpdcli_LDADD = $(UPMPDCLI_LIBS)






  134
  

  111
  





  135
  
if ENABLESPOTIFY


  112
  
if ENABLESPOTIFY






  136
  
upmpdcli_SOURCES += src/mediaserver/cdplugins/spotify/spotiproxy.cpp \


  113
  
upmpdcli_SOURCES += src/mediaserver/cdplugins/spotify/spotiproxy.cpp \






  
  
...

  
  
...





  138
  
AM_CXXFLAGS += -DENABLE_SPOTIFY


  115
  
AM_CXXFLAGS += -DENABLE_SPOTIFY






  139
  
endif


  116
  
endif






  140
  

  117
  





  141
  
scctl_SOURCES = \


  118
  
scctl_SOURCES = \






  142
  
    scctl_src/scctl.cpp \


  119
  
    scctl_src/scctl.cpp \






  143
  
    src/netcon-fixed.cpp \


  120
  
    src/netcon.cpp \






  144
  
    src/smallut.cpp \


  121
  
    src/smallut.cpp \






  145
  
    src/upmpdutils.cxx


  122
  
    src/upmpdutils.cxx






  146
  

  123
  





  147
  
scctl_LDADD = $(SCCTL_LIBS)


  124
  
scctl_LDADD = $(SCCTL_LIBS)






  148
  
              


  125
  
              






  
  
...

  
  
...





  232
  
    cfgui/confmain.cpp \


  209
  
    cfgui/confmain.cpp \






  233
  
    cfgui/mainwindow.h \


  210
  
    cfgui/mainwindow.h \






  234
  
    cfgui/picoxml.h \


  211
  
    cfgui/picoxml.h \






  235
  
    cfgui/upmpdcli-config.pro \


  212
  
    cfgui/upmpdcli-config.pro \






  236
  
    rdpl2stream.tar.gz \


  213
  
    rdpl2stream.tar.gz \






  237
  
    src/conftree.cpp \


  214
  
    autogen.sh \






  238
  
    src/execmd.cpp \


  
  





  239
  
    src/mediaserver/cdplugins/cmdtalk.cpp \


  
  





  240
  
    src/netcon.cpp src/sysvshm.cpp autogen.sh \


  
  





  241
  
    src/mediaserver/cdplugins/spotify/spotiproxy.cpp \


  215
  
    src/mediaserver/cdplugins/spotify/spotiproxy.cpp \






  242
  
    src/mediaserver/cdplugins/spotify/spotiproxy.h \


  216
  
    src/mediaserver/cdplugins/spotify/spotiproxy.h \






  243
  
    systemd/upmpdcli.service \


  217
  
    systemd/upmpdcli.service \






  244
  
    uprclbottle.tar.gz \


  218
  
    uprclbottle.tar.gz \






  245
  
    web.tar.gz


  219
  
    web.tar.gz