Switch to unified view

a/Makefile.am b/Makefile.am
1
1
2
# This should be from configure'd CFLAGS 
3
AM_CPPFLAGS = -DDEBUG -g -Wall -std=c++0x \
2
AM_CPPFLAGS = -DDEBUG -g -Wall \
4
            -DDATADIR=\"${pkgdatadir}\" -DCONFIGDIR=\"${sysconfdir}\"
3
            -DDATADIR=\"${pkgdatadir}\" -DCONFIGDIR=\"${sysconfdir}\"
4
5
AM_CXXFLAGS = -std=c++0x 
5
6
6
lib_LTLIBRARIES = libupnpp.la
7
lib_LTLIBRARIES = libupnpp.la
7
8
8
libupnpp_la_SOURCES = \
9
libupnpp_la_SOURCES = \
9
    libupnpp/cdircontent.cxx \
10
    libupnpp/cdircontent.cxx \
...
...
34
    libupnpp/vdir.cxx \
35
    libupnpp/vdir.cxx \
35
    libupnpp/vdir.hxx \
36
    libupnpp/vdir.hxx \
36
    libupnpp/workqueue.hxx
37
    libupnpp/workqueue.hxx
37
38
38
libupnpp_la_LDFLAGS = -release $(VERSION)
39
libupnpp_la_LDFLAGS = -release $(VERSION)
39
libupnpp_la_LIBADD = -lixml -lupnp -lexpat -lpthread -lrt
40
libupnpp_la_LIBADD = $(LIBUPNPP_LIBS)
40
41
41
bin_PROGRAMS = upmpdcli #upexplorer 
42
bin_PROGRAMS = upmpdcli #upexplorer 
42
43
43
#upexplorer_SOURCES = upexplo/upexplo.cxx
44
#upexplorer_SOURCES = upexplo/upexplo.cxx
44
#upexplorer_LDADD = libupnpp.la -lixml -lupnp -lexpat -lpthread -lrt
45
#upexplorer_LDADD = libupnpp.la
45
#upexplorer_LDFLAGS = 
46
#upexplorer_LDFLAGS = 
46
47
47
upmpdcli_SOURCES = \
48
upmpdcli_SOURCES = \
48
     upmpd/conftree.cxx \
49
     upmpd/conftree.cxx \
49
     upmpd/conftree.hxx \
50
     upmpd/conftree.hxx \