Switch to unified view

a/Makefile.am b/Makefile.am
...
...
4
4
5
AM_CXXFLAGS = -std=c++0x 
5
AM_CXXFLAGS = -std=c++0x 
6
6
7
lib_LTLIBRARIES = libupnpp.la
7
lib_LTLIBRARIES = libupnpp.la
8
8
9
#    libupnpp/control/service.cxx 
10
9
libupnpp_la_SOURCES = \
11
libupnpp_la_SOURCES = \
10
    libupnpp/cdircontent.cxx \
12
    libupnpp/control/cdircontent.cxx \
11
    libupnpp/cdircontent.hxx \
13
    libupnpp/control/cdircontent.hxx \
12
    libupnpp/cdirectory.cxx \
14
    libupnpp/control/cdirectory.cxx \
13
    libupnpp/cdirectory.hxx \
15
    libupnpp/control/cdirectory.hxx \
16
    libupnpp/control/mediarenderer.cxx \
17
    libupnpp/control/mediarenderer.hxx \
18
    libupnpp/control/renderingcontrol.cxx \
19
    libupnpp/control/renderingcontrol.hxx \
20
    libupnpp/control/service.cxx \
21
    libupnpp/control/service.hxx \
14
    libupnpp/description.cxx \
22
    libupnpp/description.cxx \
15
    libupnpp/description.hxx \
23
    libupnpp/description.hxx \
16
    libupnpp/device.cxx \
24
    libupnpp/device.cxx \
17
    libupnpp/device.hxx \
25
    libupnpp/device.hxx \
18
    libupnpp/discovery.cxx \
26
    libupnpp/discovery.cxx \
...
...
37
    libupnpp/workqueue.hxx
45
    libupnpp/workqueue.hxx
38
46
39
libupnpp_la_LDFLAGS = -release $(VERSION)
47
libupnpp_la_LDFLAGS = -release $(VERSION)
40
libupnpp_la_LIBADD = $(LIBUPNPP_LIBS)
48
libupnpp_la_LIBADD = $(LIBUPNPP_LIBS)
41
49
42
bin_PROGRAMS = upmpdcli #upexplorer 
50
bin_PROGRAMS = upmpdcli upexplorer 
43
51
44
#upexplorer_SOURCES = upexplo/upexplo.cxx
52
upexplorer_SOURCES = upexplo/upexplo.cxx
45
#upexplorer_LDADD = libupnpp.la
53
upexplorer_LDADD = libupnpp.la
46
54
47
upmpdcli_SOURCES = \
55
upmpdcli_SOURCES = \
48
     upmpd/conftree.cxx \
56
     upmpd/conftree.cxx \
49
     upmpd/conftree.hxx \
57
     upmpd/conftree.hxx \
50
     upmpd/ohmetacache.cxx \
58
     upmpd/ohmetacache.cxx \