--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,8 @@
# dir over all OpenHome dirs
TOPOH=@TOPOH@/
+TOPOHNET=@TOPOHNET@/
+TOPOHNETGENERATED=@TOPOHNETGENERATED@/
+TOPOHSONGCAST=@TOPOHSONGCAST@/
OTHERLIBS=@OTHERLIBS@
@@ -15,11 +18,19 @@
AM_CPPFLAGS = -DDEBUG -g -Wall \
-DDATADIR=\"${pkgdatadir}\" -DCONFIGDIR=\"${sysconfdir}\" \
- -DPACKAGE_VERSION=\"${PACKAGE_VERSION}\" \
+ -DPACKAGE_VERSION=\"${PACKAGE_VERSION}\"
+
+if WITH_OHBUILD
+AM_CPPFLAGS += \
-I$(TOPOH)ohNet/Build/Include/ \
-I$(TOPOH)ohNetGenerated/Build/Include/ \
-I$(TOPOH)ohTopology/build/Include/ \
- -I$(TOPSC)
+ -I$(TOPSC) \
+ -DWITH_OHBUILD
+else
+AM_CPPFLAGS += -I$(TOPOHNET)include/ohNet
+endif
+
if WAVSC2
AM_CPPFLAGS += \
-I$(top_srcdir)/mpd2src \
@@ -43,8 +54,17 @@
$(TOPSCO)/OhmProtocolUnicast.o \
$(TOPOH)ohNetGenerated/$(OBJIPATH)DvAvOpenhomeOrgReceiver1.o
+if WITH_OHBUILD
sc2mpd_LDADD = $(OTHEROSC2) $(TOPOH)ohNet/$(OBJIPATH)libohNetCore.a \
$(TOPOH)ohNet/$(OBJIPATH)libTestFramework.a $(OTHERLIBS)
+else
+sc2mpd_LDADD = \
+ ${TOPOHSONGCAST}lib/ohSongcast/libohSongcast.a \
+ ${TOPOHNETGENERATED}lib/ohNetGenerated/libohNetGeneratedDevices.a \
+ ${TOPOHNET}lib/ohNet/libohNetCore.a \
+ ${TOPOHNET}lib/ohNet/libTestFramework.a \
+ $(OTHERLIBS)
+endif
sc2mpd_CPPFLAGS = -I$(top_srcdir) $(AM_CPPFLAGS)
sc2mpd_SOURCES = \
@@ -79,8 +99,17 @@
$(TOPSCO)/OhmSender.o \
$(TOPOH)ohNetGenerated/$(OBJIPATH)DvAvOpenhomeOrgSender1.o
+if WITH_OHBUILD
mpd2sc_LDADD = $(OTHEROMP2) $(TOPOH)ohNet/$(OBJIPATH)libohNetCore.a \
$(TOPOH)ohNet/$(OBJIPATH)libTestFramework.a $(OTHERLIBS)
+else
+mpd2sc_LDADD = \
+ ${TOPOHSONGCAST}lib/ohSongcast/libohSongcast.a \
+ ${TOPOHNETGENERATED}lib/ohNetGenerated/libohNetGeneratedDevices.a \
+ ${TOPOHNET}lib/ohNet/libohNetCore.a \
+ ${TOPOHNET}lib/ohNet/libTestFramework.a \
+ $(OTHERLIBS)
+endif
mpd2sc_CPPFLAGS = -I$(top_srcdir)/sc2src $(AM_CPPFLAGS)
mpd2sc_SOURCES = \