Switch to unified view

a/Makefile.am b/Makefile.am
...
...
16
TOPSCO=$(TOPSC)$(OBJIPATH)
16
TOPSCO=$(TOPSC)$(OBJIPATH)
17
17
18
18
19
AM_CPPFLAGS = -DDEBUG -g -Wall \
19
AM_CPPFLAGS = -DDEBUG -g -Wall \
20
            -DDATADIR=\"${pkgdatadir}\" -DCONFIGDIR=\"${sysconfdir}\" \
20
            -DDATADIR=\"${pkgdatadir}\" -DCONFIGDIR=\"${sysconfdir}\" \
21
            -DPACKAGE_VERSION=\"${PACKAGE_VERSION}\" -DDEFINE_LITTLE_ENDIAN
21
            -DPACKAGE_VERSION=\"${PACKAGE_VERSION}\" 
22
22
23
if WITH_OHBUILD
23
if WITH_OHBUILD
24
AM_CPPFLAGS += \
24
AM_CPPFLAGS += \
25
            -I$(TOPOH)ohNet/Build/Include/ \
25
            -I$(TOPOH)ohNet/Build/Include/ \
26
            -I$(TOPOH)ohNetGenerated/Build/Include/ \
26
            -I$(TOPOH)ohNetGenerated/Build/Include/ \
...
...
39
endif
39
endif
40
40
41
AM_CXXFLAGS = -std=c++11
41
AM_CXXFLAGS = -std=c++11
42
42
43
bin_PROGRAMS = sc2mpd mpd2sc
43
bin_PROGRAMS = sc2mpd mpd2sc
44
45
# Maybe these are needed for the oh headers ?
46
OHCCFLAGS = -D_GNU_SOURCE -D_REENTRANT -DDEFINE_LITTLE_ENDIAN \
47
          -DDEFINE_TRACE \
48
          -DDllImport="__attribute__ ((visibility(\"default\")))" \
49
          -DDllExport="__attribute__ ((visibility(\"default\")))" \
50
          -DDllExportClass="__attribute__ ((visibility(\"default\")))"
51
44
52
OTHEROSC2 = $(TOPSCO)/Ohm.o $(TOPSCO)/OhmMsg.o $(TOPSCO)/OhmSocket.o \
45
OTHEROSC2 = $(TOPSCO)/Ohm.o $(TOPSCO)/OhmMsg.o $(TOPSCO)/OhmSocket.o \
53
             $(TOPSCO)/OhmReceiver.o $(TOPSCO)/OhmProtocolMulticast.o \
46
             $(TOPSCO)/OhmReceiver.o $(TOPSCO)/OhmProtocolMulticast.o \
54
             $(TOPSCO)/OhmProtocolUnicast.o \
47
             $(TOPSCO)/OhmProtocolUnicast.o \
55
             $(TOPOH)ohNetGenerated/$(OBJIPATH)DvAvOpenhomeOrgReceiver1.o
48
             $(TOPOH)ohNetGenerated/$(OBJIPATH)DvAvOpenhomeOrgReceiver1.o