atmo: no need for custom makefile

diff --git a/modules/video_filter/Modules.am b/modules/video_filter/Modules.am
index 40aebcc1f964f253939dcbd63752b192d6567366..3507c07bb65c973e8d87fe7474b6b1f752ba1d85 100644 (file)
--- a/modules/video_filter/Modules.am
+++ b/modules/video_filter/Modules.am
@@ -50,6 +50,20 @@ SOURCES_swscale_maemo = swscale_maemo.c \
        libswscale_nokia770/arm_colorconv.h
 SOURCES_scene = scene.c
 SOURCES_yuvp = yuvp.c
+SOURCES_atmo = atmo/atmo.cpp \
+       atmo/AtmoDefs.h \
+       atmo/AtmoCalculations.cpp atmo/AtmoCalculations.h \
+       atmo/AtmoConfig.cpp atmo/AtmoConfig.h \
+       atmo/AtmoConnection.cpp atmo/AtmoConnection.h \
+       atmo/AtmoDynData.cpp atmo/AtmoDynData.h \
+       atmo/AtmoExternalCaptureInput.cpp atmo/AtmoExternalCaptureInput.h \
+       atmo/AtmoInput.cpp atmo/AtmoInput.h \
+       atmo/AtmoLiveView.cpp atmo/AtmoLiveView.h \
+       atmo/AtmoOutputFilter.cpp atmo/AtmoOutputFilter.h \
+       atmo/AtmoSerialConnection.cpp atmo/AtmoSerialConnection.h \
+       atmo/AtmoThread.cpp atmo/AtmoThread.h \
+       atmo/AtmoTools.cpp atmo/AtmoTools.h \
+       atmo/AtmoZoneDefinition.cpp atmo/AtmoZoneDefinition.h
 SOURCES_video_filter_wrapper = wrapper.c
 noinst_HEADERS = filter_common.h filter_picture.h
 

diff --git a/modules/video_filter/atmo/Modules.am b/modules/video_filter/atmo/Modules.am
deleted file mode 100644 (file)
index 3263cd5..0000000
--- a/modules/video_filter/atmo/Modules.am
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES_atmo = atmo.cpp AtmoDefs.h AtmoCalculations.cpp AtmoCalculations.h AtmoConfig.cpp AtmoConfig.h AtmoConnection.cpp AtmoConnection.h AtmoDynData.cpp AtmoDynData.h AtmoExternalCaptureInput.cpp AtmoExternalCaptureInput.h AtmoInput.cpp AtmoInput.h AtmoLiveView.cpp AtmoLiveView.h AtmoOutputFilter.cpp AtmoOutputFilter.h AtmoSerialConnection.cpp AtmoSerialConnection.h AtmoThread.cpp AtmoThread.h AtmoTools.cpp AtmoTools.h AtmoZoneDefinition.cpp AtmoZoneDefinition.h 
-