Switch to unified view

a/Makefile.am b/Makefile.am
...
...
59
     
59
     
60
OTHEROMP2 = $(TOPSCO)/Ohm.o $(TOPSCO)/OhmMsg.o $(TOPSCO)/OhmSocket.o \
60
OTHEROMP2 = $(TOPSCO)/Ohm.o $(TOPSCO)/OhmMsg.o $(TOPSCO)/OhmSocket.o \
61
             $(TOPSCO)/OhmSender.o \
61
             $(TOPSCO)/OhmSender.o \
62
             $(TOPOH)ohNetGenerated/$(OBJIPATH)DvAvOpenhomeOrgSender1.o
62
             $(TOPOH)ohNetGenerated/$(OBJIPATH)DvAvOpenhomeOrgSender1.o
63
63
64
mpd2sc_CPPFLAGS = -I$(srcdir)/sc2src $(AM_CPPFLAGS) 
65
mpd2sc_LDADD = $(OTHEROMP2) $(TOPOH)ohNet/$(OBJIPATH)libohNetCore.a \
64
mpd2sc_LDADD = $(OTHEROMP2) $(TOPOH)ohNet/$(OBJIPATH)libohNetCore.a \
66
     $(TOPOH)ohNet/$(OBJIPATH)libTestFramework.a $(OTHERLIBS)
65
     $(TOPOH)ohNet/$(OBJIPATH)libTestFramework.a $(OTHERLIBS)
67
66
67
mpd2sc_CPPFLAGS = -I$(top_srcdir)/sc2src $(AM_CPPFLAGS)
68
mpd2sc_SOURCES = \
68
mpd2sc_SOURCES = \
69
     mpd2src/audioreader.h \
70
     mpd2src/audioutil.h \
69
     mpd2src/base64.cxx \
71
     mpd2src/base64.cxx \
72
     mpd2src/base64.hxx \
70
     mpd2src/fiforeader.cpp \
73
     mpd2src/fiforeader.cpp \
74
     mpd2src/fiforeader.h \
75
     mpd2src/icon.h \
76
     mpd2src/mpd2sc.cpp \
71
     mpd2src/openaudio.cpp \
77
     mpd2src/openaudio.cpp \
78
     mpd2src/openaudio.h \
72
     mpd2src/stringtotokens.cpp \
79
     mpd2src/stringtotokens.cpp \
73
     mpd2src/mpd2sc.cpp \
80
     mpd2src/stringtotokens.h \
74
     mpd2src/wavreader.cpp \
81
     mpd2src/wavreader.cpp \
82
     mpd2src/wavreader.h \
75
     sc2src/log.cpp
83
     sc2src/log.cpp
76
     
84
     
85
dist_bin_SCRIPTS = mpd2src/scmakempdsender