Mono audio filter is a channel_mixer and not a convertor.

[vlc] / modules / control / corba / Modules.am

diff --git a/modules/control/corba/Modules.am b/modules/control/corba/Modules.am
index 8983374aa93f92b4279cbebf3c25c6e33065162f..d235575adb5df7dddec786b25ef5ba138b511051 100644 (file)
--- a/modules/control/corba/Modules.am
+++ b/modules/control/corba/Modules.am
@@ -1,19 +1,27 @@
 ## corba module declaration
 
-SOURCES_corba = corba.c mediacontrol-core.c mediacontrol-plugin.c
+SOURCES_corba = corba.c ../../../src/control/mediacontrol_plugin.c
 
 nodist_SOURCES_corba = \
        MediaControl-common.c \
        MediaControl-skels.c \
+       MediaControl-stubs.c \
        MediaControl.h \
        $(NULL)
 
+if ENABLE_CORBA
+
+GENERATEDFILES = MediaControl-common.c MediaControl-skels.c MediaControl.h
+
+endif
+
+CORBAIDLFILE = MediaControl.idl
+
 EXTRA_DIST += $(CORBAIDLFILE)
-BUILT_SOURCES += $(GENERATEDFILES) $(IMODULEFILE)
+BUILT_SOURCES += $(GENERATEDFILES)
 
 if ENABLE_CORBA
 
-CORBAIDLFILE = MediaControl.idl
 
 corbaidldir = $(datadir)/idl
 corbaidl_DATA = $(CORBAIDLFILE)
@@ -21,29 +29,26 @@ corbaidl_DATA = $(CORBAIDLFILE)
 ## orbittypelibdir = $(libdir)/orbit-2.0
 orbittypelibdir = $(libdir)/advene
 orbittypelib_DATA = MediaControl.so
+orbittypelib_CFLAGS=`$(VLC_CONFIG) --cflags plugin corba`
+orbittypelib_LIBS=`$(VLC_CONFIG) --libs plugin corba`
 
-ORBIT_IDL=$(shell pkg-config --variable=orbit_idl ORBit-2.0)
-
-GENERATEDFILES = MediaControl-common.c MediaControl-skels.c MediaControl.h
-IMODULEFILE = $(IMODULEFILE)
+ORBIT_IDL=`$(PKG_CONFIG) --variable=orbit_idl ORBit-2.0`
 
 ## MediaControl.so rules
-MediaControl.so: MediaControl-imodule.c
-       $(CC) -fPIC -o MediaControl-imodule.o -c $< $(CORBA_CFLAGS)
-       $(CC) -shared -o $@ MediaControl-imodule.o $(CORBA_LIBS)
+MediaControl-imodule.o: MediaControl-imodule.c
+       $(CC) -fPIC -o $@ -c $< $(orbittypelib_CFLAGS)
 
-$(GENERATEDFILES): $(CORBAIDLFILE)
-       $(ORBIT_IDL) $<
+MediaControl.so: MediaControl-imodule.o
+       $(CC) -shared -o $@ $< $(orbittypelib_LIBS)
 
 ## We have to invoke 2 times $(ORBIT_IDL), else the --imodule
 ## invocation builds MediaControl-common.c without some
 ## glue code that is needed.
-$(IMODULEFILE): $(CORBAIDLFILE)
+$(GENERATEDFILES): $(CORBAIDLFILE)
        $(ORBIT_IDL) --imodule $<
        $(ORBIT_IDL) $<
 
 clean:
        $(RM) -f $(GENERATEDFILES)
-       $(RM) -f $(IMODULEFILE)
 
 endif