Permalink
Browse files

makefile.in clean up and add USE_OMXLIB to build control

  • Loading branch information...
davilla committed Sep 9, 2012
1 parent 545d6c8 commit dcb49237a7b0f6cc3b9ddc64f9d8dd662c2c98f0
View
@@ -2359,6 +2359,7 @@ AC_SUBST(USE_CEC_RPI_API)
AC_SUBST(USE_MYSQL)
AC_SUBST(USE_WEB_SERVER)
AC_SUBST(USE_UPNP)
+AC_SUBST(USE_OMXLIB)
AC_SUBST(USE_ANDROID)
AC_SUBST(GTEST_CONFIGURED)
View
@@ -1,15 +1,15 @@
-SRCS=CDDARipJob.cpp \
- CDDARipper.cpp \
- Encoder.cpp \
- EncoderFFmpeg.cpp \
- EncoderFlac.cpp \
- EncoderWav.cpp
+SRCS = CDDARipJob.cpp
+SRCS += CDDARipper.cpp
+SRCS += Encoder.cpp
+SRCS += EncoderFFmpeg.cpp
+SRCS += EncoderFlac.cpp
+SRCS += EncoderWav.cpp
ifeq (@HAVE_LIBMP3LAME@,1)
-SRCS+=EncoderLame.cpp
+SRCS += EncoderLame.cpp
endif
ifeq (@HAVE_LIBVORBISENC@,1)
-SRCS+=EncoderVorbis.cpp
+SRCS += EncoderVorbis.cpp
endif
LIB=cdrip.a
@@ -1,23 +1,23 @@
-CFLAGS+=-DAPI_DEBUG
-CXXFLAGS+=-DAPI_DEBUG
+CFLAGS += -DAPI_DEBUG
+CXXFLAGS += -DAPI_DEBUG
-SRCS=coff.cpp \
- dll.cpp \
- DllLoader.cpp \
- DllLoaderContainer.cpp \
- dll_tracker.cpp \
- dll_tracker_file.cpp \
- dll_tracker_library.cpp \
- dll_util.cpp \
- LibraryLoader.cpp \
- mmap_anon.c \
- SoLoader.cpp \
+SRCS = coff.cpp
+SRCS += dll.cpp
+SRCS += DllLoader.cpp
+SRCS += DllLoaderContainer.cpp
+SRCS += dll_tracker.cpp
+SRCS += dll_tracker_file.cpp
+SRCS += dll_tracker_library.cpp
+SRCS += dll_util.cpp
+SRCS += LibraryLoader.cpp
+SRCS += mmap_anon.c
+SRCS += SoLoader.cpp
ifneq ($(findstring freebsd,@ARCH@),freebsd)
SRCS += ldt_keeper.c
endif
-LIB=dllloader.a
+LIB = dllloader.a
-include ../../../Makefile.include
+include @abs_top_srcdir@/Makefile.include
-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))
@@ -1,13 +1,13 @@
-SRCS=emu_dummy.cpp \
- emu_kernel32.cpp \
- emu_msvcrt.cpp \
- wrapper.c
+SRCS = emu_dummy.cpp
+SRCS += emu_kernel32.cpp
+SRCS += emu_msvcrt.cpp
+SRCS += wrapper.c
-LIB=exports.a
+LIB = exports.a
-CLEAN_FILES=wrapper.def
+CLEAN_FILES = wrapper.def
-include ../../../../Makefile.include
+include @abs_top_srcdir@/Makefile.include
-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))
wrapper.o : wrapper.c
View
@@ -1,6 +1,6 @@
-SRCS=DummyVideoPlayer.cpp \
+SRCS = DummyVideoPlayer.cpp
-LIB=cores.a
+LIB = cores.a
include @abs_top_srcdir@/Makefile.include
-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))
@@ -1,27 +1,24 @@
-SRCS=BaseRenderer.cpp \
- OverlayRenderer.cpp \
- OverlayRendererUtil.cpp \
- RenderCapture.cpp \
- RenderManager.cpp \
+SRCS = BaseRenderer.cpp
+SRCS += OverlayRenderer.cpp
+SRCS += OverlayRendererUtil.cpp
+SRCS += RenderCapture.cpp
+SRCS += RenderManager.cpp
ifeq ($(findstring arm,@ARCH@),arm)
-SRCS+= yuv2rgb.neon.S \
-
+SRCS += yuv2rgb.neon.S
endif
ifeq (@USE_OPENGL@,1)
-SRCS+= LinuxRendererGL.cpp \
- OverlayRendererGL.cpp \
-
+SRCS += LinuxRendererGL.cpp
+SRCS += OverlayRendererGL.cpp
endif
ifeq (@USE_OPENGLES@,1)
-SRCS+= LinuxRendererGLES.cpp \
- OverlayRendererGL.cpp \
-
+SRCS += LinuxRendererGLES.cpp
+SRCS += OverlayRendererGL.cpp
endif
-LIB=VideoRenderer.a
+LIB = VideoRenderer.a
include @abs_top_srcdir@/Makefile.include
-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(patsubst %.S,,$(SRCS))))
@@ -2,11 +2,11 @@ INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/dvdplayer
CXXFLAGS+=-DHAVE_MMX
-SRCS= DVDAudioCodecFFmpeg.cpp \
- DVDAudioCodecLibMad.cpp \
- DVDAudioCodecLPcm.cpp \
- DVDAudioCodecPassthrough.cpp \
- DVDAudioCodecPcm.cpp
+SRCS = DVDAudioCodecFFmpeg.cpp
+SRCS += DVDAudioCodecLibMad.cpp
+SRCS += DVDAudioCodecLPcm.cpp
+SRCS += DVDAudioCodecPassthrough.cpp
+SRCS += DVDAudioCodecPcm.cpp
ifeq ($(findstring osx,@ARCH@),osx)
SRCS += DVDAudioCodecPassthroughFFmpeg.cpp
@@ -1,7 +1,7 @@
INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/dvdplayer
-SRCS= DVDCodecUtils.cpp \
- DVDFactoryCodec.cpp \
+SRCS = DVDCodecUtils.cpp
+SRCS += DVDFactoryCodec.cpp
LIB= DVDCodecs.a
@@ -1,13 +1,13 @@
-INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/dvdplayer \
+INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/dvdplayer
-SRCS= DVDOverlayCodecCC.cpp \
- DVDOverlayCodecFFmpeg.cpp \
- DVDOverlayCodecSSA.cpp \
- DVDOverlayCodecText.cpp \
- DVDOverlayCodecTX3G.cpp \
- libspucc/cc_decoder.c \
+SRCS = DVDOverlayCodecCC.cpp
+SRCS += DVDOverlayCodecFFmpeg.cpp
+SRCS += DVDOverlayCodecSSA.cpp
+SRCS += DVDOverlayCodecText.cpp
+SRCS += DVDOverlayCodecTX3G.cpp
+SRCS += libspucc/cc_decoder.c
-LIB= Overlay.a
+LIB = Overlay.a
include @abs_top_srcdir@/Makefile.include
-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))
@@ -1,31 +1,26 @@
-INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/dvdplayer \
+INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/dvdplayer
-SRCS= DVDVideoCodecFFmpeg.cpp \
- DVDVideoCodecLibMpeg2.cpp \
- DVDVideoPPFFmpeg.cpp \
+SRCS = DVDVideoCodecFFmpeg.cpp
+SRCS += DVDVideoCodecLibMpeg2.cpp
+SRCS += DVDVideoPPFFmpeg.cpp
ifeq (@USE_VDPAU@,1)
-SRCS+= VDPAU.cpp \
-
+SRCS += VDPAU.cpp
endif
ifeq (@USE_VAAPI@,1)
-SRCS+= VAAPI.cpp \
-
+SRCS += VAAPI.cpp
endif
ifeq (@USE_CRYSTALHD@,1)
-SRCS+= CrystalHD.cpp \
- DVDVideoCodecCrystalHD.cpp \
-
+SRCS += CrystalHD.cpp
+SRCS += DVDVideoCodecCrystalHD.cpp
endif
ifeq (@USE_VDA@,1)
-SRCS+= DVDVideoCodecVDA.cpp \
-
+SRCS += DVDVideoCodecVDA.cpp
endif
ifeq (@USE_OPENMAX@,1)
-SRCS += OpenMax.cpp \
- OpenMaxVideo.cpp \
- DVDVideoCodecOpenMax.cpp \
-
+SRCS += OpenMax.cpp
+SRCS += OpenMaxVideo.cpp
+SRCS += DVDVideoCodecOpenMax.cpp
endif
LIB=Video.a
@@ -1,15 +1,15 @@
INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/dvdplayer
-SRCS= DVDDemux.cpp \
- DVDDemuxFFmpeg.cpp \
- DVDDemuxHTSP.cpp \
- DVDDemuxPVRClient.cpp \
- DVDDemuxShoutcast.cpp \
- DVDDemuxUtils.cpp \
- DVDDemuxVobsub.cpp \
- DVDFactoryDemuxer.cpp \
+SRCS = DVDDemux.cpp
+SRCS += DVDDemuxFFmpeg.cpp
+SRCS += DVDDemuxHTSP.cpp
+SRCS += DVDDemuxPVRClient.cpp
+SRCS += DVDDemuxShoutcast.cpp
+SRCS += DVDDemuxUtils.cpp
+SRCS += DVDDemuxVobsub.cpp
+SRCS += DVDFactoryDemuxer.cpp
-LIB= DVDDemuxers.a
+LIB = DVDDemuxers.a
include @abs_top_srcdir@/Makefile.include
-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))
@@ -1,19 +1,19 @@
INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/dvdplayer
-SRCS= DVDFactorySubtitle.cpp \
- DVDSubtitleLineCollection.cpp \
- DVDSubtitleParserMicroDVD.cpp \
- DVDSubtitleParserMPL2.cpp \
- DVDSubtitleParserSami.cpp \
- DVDSubtitleParserSSA.cpp \
- DVDSubtitleParserSubrip.cpp \
- DVDSubtitleParserVplayer.cpp \
- DVDSubtitleTagMicroDVD.cpp \
- DVDSubtitleTagSami.cpp \
- DVDSubtitlesLibass.cpp \
- DVDSubtitleStream.cpp \
+SRCS = DVDFactorySubtitle.cpp
+SRCS += DVDSubtitleLineCollection.cpp
+SRCS += DVDSubtitleParserMicroDVD.cpp
+SRCS += DVDSubtitleParserMPL2.cpp
+SRCS += DVDSubtitleParserSami.cpp
+SRCS += DVDSubtitleParserSSA.cpp
+SRCS += DVDSubtitleParserSubrip.cpp
+SRCS += DVDSubtitleParserVplayer.cpp
+SRCS += DVDSubtitleTagMicroDVD.cpp
+SRCS += DVDSubtitleTagSami.cpp
+SRCS += DVDSubtitlesLibass.cpp
+SRCS += DVDSubtitleStream.cpp
-LIB= DVDSubtitles.a
+LIB = DVDSubtitles.a
include @abs_top_srcdir@/Makefile.include
-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))
@@ -1,26 +1,26 @@
CXXFLAGS+=-D__STDC_FORMAT_MACROS
-SRCS= DVDAudio.cpp \
- DVDClock.cpp \
- DVDDemuxSPU.cpp \
- DVDFileInfo.cpp \
- DVDMessage.cpp \
- DVDMessageQueue.cpp \
- DVDMessageTracker.cpp \
- DVDOverlayContainer.cpp \
- DVDOverlayRenderer.cpp \
- DVDPerformanceCounter.cpp \
- DVDPlayer.cpp \
- DVDPlayerAudio.cpp \
- DVDPlayerAudioResampler.cpp \
- DVDPlayerSubtitle.cpp \
- DVDPlayerTeletext.cpp \
- DVDPlayerVideo.cpp \
- DVDStreamInfo.cpp \
- DVDTSCorrection.cpp \
- Edl.cpp
+SRCS = DVDAudio.cpp
+SRCS += DVDClock.cpp
+SRCS += DVDDemuxSPU.cpp
+SRCS += DVDFileInfo.cpp
+SRCS += DVDMessage.cpp
+SRCS += DVDMessageQueue.cpp
+SRCS += DVDMessageTracker.cpp
+SRCS += DVDOverlayContainer.cpp
+SRCS += DVDOverlayRenderer.cpp
+SRCS += DVDPerformanceCounter.cpp
+SRCS += DVDPlayer.cpp
+SRCS += DVDPlayerAudio.cpp
+SRCS += DVDPlayerAudioResampler.cpp
+SRCS += DVDPlayerSubtitle.cpp
+SRCS += DVDPlayerTeletext.cpp
+SRCS += DVDPlayerVideo.cpp
+SRCS += DVDStreamInfo.cpp
+SRCS += DVDTSCorrection.cpp
+SRCS += Edl.cpp
-LIB= DVDPlayer.a
+LIB = DVDPlayer.a
include @abs_top_srcdir@/Makefile.include
-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))
@@ -1,16 +1,15 @@
CXXFLAGS += -D__STDC_FORMAT_MACROS
-SRCS= \
- OMXPlayer.cpp \
- OMXAudio.cpp \
- OMXVideo.cpp \
- OMXAudioCodecOMX.cpp \
- OMXPlayerAudio.cpp \
- OMXPlayerVideo.cpp \
- OMXImage.cpp \
- BitstreamConverter.cpp
+SRCS = OMXPlayer.cpp
+SRCS += OMXAudio.cpp
+SRCS += OMXVideo.cpp
+SRCS += OMXAudioCodecOMX.cpp
+SRCS += OMXPlayerAudio.cpp
+SRCS += OMXPlayerVideo.cpp
+SRCS += OMXImage.cpp
+SRCS += BitstreamConverter.cpp
-LIB= omxplayer.a
+LIB = omxplayer.a
@abs_top_srcdir@/system/advancedsettings.xml: $(LIB)
cp -f omxplayer_advancedsettings.xml $@
Oops, something went wrong.

2 comments on commit dcb4923

Owner

Memphiz replied Sep 9, 2012

Nice - you had a regexp for this i hope :D

Contributor

davilla replied Sep 9, 2012

haha, no. I don't trust a global search and replace on something like this. Now to do our plain Makefiles that are not autogenerated.

Please sign in to comment.