Switch to unified view

a/Makefile.am b/Makefile.am
1
# dir over all OpenHome dirs
1
# dir over all OpenHome dirs
2
TOPOH=@TOPOH@/
2
TOPOH=@TOPOH@/
3
TOPOHNET=@TOPOHNET@/
4
TOPOHNETGENERATED=@TOPOHNETGENERATED@/
5
TOPOHSONGCAST=@TOPOHSONGCAST@/
3
6
4
OTHERLIBS=@OTHERLIBS@
7
OTHERLIBS=@OTHERLIBS@
5
8
6
OHBTYPE=Release
9
OHBTYPE=Release
7
10
...
...
13
TOPSCO=$(TOPSC)$(OBJIPATH)
16
TOPSCO=$(TOPSC)$(OBJIPATH)
14
17
15
18
16
AM_CPPFLAGS = -DDEBUG -g -Wall \
19
AM_CPPFLAGS = -DDEBUG -g -Wall \
17
            -DDATADIR=\"${pkgdatadir}\" -DCONFIGDIR=\"${sysconfdir}\" \
20
            -DDATADIR=\"${pkgdatadir}\" -DCONFIGDIR=\"${sysconfdir}\" \
18
            -DPACKAGE_VERSION=\"${PACKAGE_VERSION}\" \
21
            -DPACKAGE_VERSION=\"${PACKAGE_VERSION}\"
22
23
if WITH_OHBUILD
24
AM_CPPFLAGS += \
19
            -I$(TOPOH)ohNet/Build/Include/ \
25
            -I$(TOPOH)ohNet/Build/Include/ \
20
            -I$(TOPOH)ohNetGenerated/Build/Include/ \
26
            -I$(TOPOH)ohNetGenerated/Build/Include/ \
21
            -I$(TOPOH)ohTopology/build/Include/  \
27
            -I$(TOPOH)ohTopology/build/Include/  \
22
            -I$(TOPSC)
28
            -I$(TOPSC) \
29
            -DWITH_OHBUILD
30
else
31
AM_CPPFLAGS += -I$(TOPOHNET)include/ohNet
32
endif
33
23
if WAVSC2
34
if WAVSC2
24
AM_CPPFLAGS += \
35
AM_CPPFLAGS += \
25
            -I$(top_srcdir)/mpd2src \
36
            -I$(top_srcdir)/mpd2src \
26
            -I$(top_srcdir)/sc2src \
37
            -I$(top_srcdir)/sc2src \
27
            -DWITH_WAVSC2
38
            -DWITH_WAVSC2
...
...
41
OTHEROSC2 = $(TOPSCO)/Ohm.o $(TOPSCO)/OhmMsg.o $(TOPSCO)/OhmSocket.o \
52
OTHEROSC2 = $(TOPSCO)/Ohm.o $(TOPSCO)/OhmMsg.o $(TOPSCO)/OhmSocket.o \
42
             $(TOPSCO)/OhmReceiver.o $(TOPSCO)/OhmProtocolMulticast.o \
53
             $(TOPSCO)/OhmReceiver.o $(TOPSCO)/OhmProtocolMulticast.o \
43
             $(TOPSCO)/OhmProtocolUnicast.o \
54
             $(TOPSCO)/OhmProtocolUnicast.o \
44
             $(TOPOH)ohNetGenerated/$(OBJIPATH)DvAvOpenhomeOrgReceiver1.o
55
             $(TOPOH)ohNetGenerated/$(OBJIPATH)DvAvOpenhomeOrgReceiver1.o
45
56
57
if WITH_OHBUILD
46
sc2mpd_LDADD = $(OTHEROSC2) $(TOPOH)ohNet/$(OBJIPATH)libohNetCore.a \
58
sc2mpd_LDADD = $(OTHEROSC2) $(TOPOH)ohNet/$(OBJIPATH)libohNetCore.a \
47
     $(TOPOH)ohNet/$(OBJIPATH)libTestFramework.a $(OTHERLIBS)
59
     $(TOPOH)ohNet/$(OBJIPATH)libTestFramework.a $(OTHERLIBS)
60
else
61
sc2mpd_LDADD = \
62
     ${TOPOHSONGCAST}lib/ohSongcast/libohSongcast.a \
63
     ${TOPOHNETGENERATED}lib/ohNetGenerated/libohNetGeneratedDevices.a \
64
     ${TOPOHNET}lib/ohNet/libohNetCore.a \
65
     ${TOPOHNET}lib/ohNet/libTestFramework.a \
66
     $(OTHERLIBS)
67
endif
48
sc2mpd_CPPFLAGS = -I$(top_srcdir) $(AM_CPPFLAGS) 
68
sc2mpd_CPPFLAGS = -I$(top_srcdir) $(AM_CPPFLAGS) 
49
69
50
sc2mpd_SOURCES = \
70
sc2mpd_SOURCES = \
51
     ohbuild.sh \
71
     ohbuild.sh \
52
     sc2src/alsadirect.cpp \
72
     sc2src/alsadirect.cpp \
...
...
77
97
78
OTHEROMP2 = $(TOPSCO)/Ohm.o $(TOPSCO)/OhmMsg.o $(TOPSCO)/OhmSocket.o \
98
OTHEROMP2 = $(TOPSCO)/Ohm.o $(TOPSCO)/OhmMsg.o $(TOPSCO)/OhmSocket.o \
79
             $(TOPSCO)/OhmSender.o \
99
             $(TOPSCO)/OhmSender.o \
80
             $(TOPOH)ohNetGenerated/$(OBJIPATH)DvAvOpenhomeOrgSender1.o
100
             $(TOPOH)ohNetGenerated/$(OBJIPATH)DvAvOpenhomeOrgSender1.o
81
101
102
if WITH_OHBUILD
82
mpd2sc_LDADD = $(OTHEROMP2) $(TOPOH)ohNet/$(OBJIPATH)libohNetCore.a \
103
mpd2sc_LDADD = $(OTHEROMP2) $(TOPOH)ohNet/$(OBJIPATH)libohNetCore.a \
83
     $(TOPOH)ohNet/$(OBJIPATH)libTestFramework.a $(OTHERLIBS)
104
     $(TOPOH)ohNet/$(OBJIPATH)libTestFramework.a $(OTHERLIBS)
105
else
106
mpd2sc_LDADD = \
107
     ${TOPOHSONGCAST}lib/ohSongcast/libohSongcast.a \
108
     ${TOPOHNETGENERATED}lib/ohNetGenerated/libohNetGeneratedDevices.a \
109
     ${TOPOHNET}lib/ohNet/libohNetCore.a \
110
     ${TOPOHNET}lib/ohNet/libTestFramework.a \
111
     $(OTHERLIBS)
112
endif
84
113
85
mpd2sc_CPPFLAGS = -I$(top_srcdir)/sc2src $(AM_CPPFLAGS)
114
mpd2sc_CPPFLAGS = -I$(top_srcdir)/sc2src $(AM_CPPFLAGS)
86
mpd2sc_SOURCES = \
115
mpd2sc_SOURCES = \
87
     mpd2src/audioreader.h \
116
     mpd2src/audioreader.h \
88
     mpd2src/audioutil.h \
117
     mpd2src/audioutil.h \