11# Compilers & flags
2- CC = gcc ;
3- C++ = g++ ;
4- CCFLAGS = $(CFLAGS) ;
5- C++FLAGS = $(CFLAGS) ;
6- AS = nasm -f elf ;
7- LINK = g++ ;
8- OPTIM = -O3 -funroll-loops ;
2+ CC = gcc ;
3+ C++ = g++ ;
4+ AS = nasm -f elf ;
5+ LINK = g++ ;
6+ OPTIM = -O3 -funroll-loops ;
97
10- # HandBrake defines
11- HB_VERSION = 0.6.0 ;
8+ HB_VERSION = 0.6.1 ;
129DEFINES = HB_$(OS) HB_VERSION=\\\"$(HB_VERSION)\\\" ;
13- #DEFINES += HB_NOMMX ;
10+ LANGUAGES = fr de it pl ru nl es pt ;
1411
15- LANGUAGES = fr de it pl ru nl es pt ;
12+ NotFile clean-contrib clean-all ;
13+ Always clean-contrib ;
14+ Depends clean-all : clean clean-contrib ;
1615
17- # OS-specific
18- if $(OS) = BEOS
19- {
20- CCFLAGS += -Wno-multichar ;
21- C++FLAGS += -Wno-multichar ;
22- }
23- else if $(OS) = LINUX
24- {
25- LINKLIBS = -lpthread ;
26- }
27- else if $(OS) = MACOSX
28- {
29- # To clean HandBrake.app
30- RM = rm -rf ;
31- }
32-
33- # Contrib* rules: mostly the same than Jambase rules, except
34- # * Targets aren't cleaned by jam clean (to prevent from deleting
16+ # _Object: same as Jambase's Object, except
17+ # * those aren't cleaned by 'jam clean' (to prevent from deleting
3518# every contrib library by accident)
36- # * ContribObject handles *.asm files
37- # * Temporary *.o files aren't removed
38- rule ContribObject
19+ # * it handles *.asm files
20+ rule _Object
3921{
4022 MakeLocate $(<) : $(LOCATE_TARGET) ;
4123 SEARCH on $(>) = $(SEARCH_SOURCE) ;
@@ -51,33 +33,28 @@ rule ContribObject
5133 case .asm : As $(<) : $(>) ;
5234 case .nas : As $(<) : $(>) ;
5335 case .c : Cc $(<) : $(>) ;
54- case .C : C++ $(<) : $(>) ;
55- case .cc : C++ $(<) : $(>) ;
5636 case .cpp : C++ $(<) : $(>) ;
57- case .f : Fortran $(<) : $(>) ;
58- case .l : Cc $(<) : $(<:S=.c) ;
59- Lex $(<:S=.c) : $(>) ;
60- case .s : As $(<) : $(>) ;
61- case .y : Cc $(<) : $(<:S=$(YACCGEN)) ;
62- Yacc $(<:S=$(YACCGEN)) : $(>) ;
63- case * : UserObject $(<) : $(>) ;
6437 }
6538}
66- rule ContribObjects
39+ # _Objects: use _Object
40+ rule _Objects
6741{
6842 local _i ;
6943 for _i in [ FGristFiles $(<) ]
7044 {
71- ContribObject $(_i:S=$(SUFOBJ)) : $(_i) ;
45+ _Object $(_i:S=$(SUFOBJ)) : $(_i) ;
7246 Depends obj : $(_i:S=$(SUFOBJ)) ;
7347 }
7448}
75- rule ContribLibrary
49+
50+ # Simplified LibraryFromObjects which doesn't clean the target library
51+ # nor the temporary .o files
52+ rule _Library
7653{
7754 local _l _s ;
7855 _s = [ FGristFiles $(>:S=$(SUFOBJ)) ] ;
7956 _l = $(<:S=$(SUFLIB)) ;
80- ContribObjects $(>) ;
57+ _Objects $(>) ;
8158 Depends obj : $(_s) ;
8259 MakeLocate $(_l) $(_l)($(_s:BS)) : $(LOCATE_TARGET) ;
8360 Depends $(_l) : $(_s) ;
@@ -86,40 +63,50 @@ rule ContribLibrary
8663 Depends lib : $(_l) ;
8764}
8865
89- # Custom Library rule: same as ContribLibrary, except 'jam clean'
90- # removes built objects
66+ # ContribLibrary: library cleaned by 'jam clean-contrib'
67+ rule ContribLibrary
68+ {
69+ _Library $(<) : $(>) ;
70+ Clean clean-contrib : [ FGristFiles $(>:S=$(SUFOBJ)) ] ;
71+ Clean clean-contrib : $(<:S=$(SUFLIB)) ;
72+ }
73+
74+ # Library: library cleaned by 'jam clean'
9175rule Library
9276{
93- ContribLibrary $(<) : $(>) ;
77+ _Library $(<) : $(>) ;
9478 Clean clean : [ FGristFiles $(>:S=$(SUFOBJ)) ] ;
9579 Clean clean : $(<:S=$(SUFLIB)) ;
9680}
9781
9882# Build HandBrake.app using Xcode
9983rule OSXApp
100- {
101- Clean clean : $(1) macosx/build ;
102- BuildOSXApp $(1) ;
84+ {
85+ Depends exe : $(<) ;
86+ Depends $(<) : $(>) ;
87+ Clean clean : $(1) macosx/build ;
88+ BuildOSXApp $(<) ;
10389}
10490actions BuildOSXApp
10591{
106- $(RM) $(1 ) && \
92+ $(RM) $(< ) && \
10793 ( cd macosx && xcodebuild ) && \
108- cp -r macosx/build/HandBrake.app $(1 ) && \
94+ cp -r macosx/build/HandBrake.app $(< ) && \
10995 for i in $(LANGUAGES) ; do \
110- ( cd $(1 )/Contents/Resources && \
96+ ( cd $(< )/Contents/Resources && \
11197 cp -r English.lproj $i.lproj && \
11298 cp ../../../macosx/i18n/$i.strings \
11399 $i.lproj/Localizable.strings ) \
114100 done ;
115101}
116102rule OSXPackage
117- {
118- BuildOSXPackage $(1) ;
103+ {
104+ Depends $(<) : $(>) ;
105+ BuildOSXPackage $(<) ;
119106}
120107actions BuildOSXPackage
121108{
122- rm -rf $(1 ) "HandBrake $(HB_VERSION)" && \
109+ rm -rf $(< ) "HandBrake $(HB_VERSION)" && \
123110 mkdir "HandBrake $(HB_VERSION)" && \
124111 cp AUTHORS "HandBrake $(HB_VERSION)/AUTHORS.txt" && \
125112 cp COPYING "HandBrake $(HB_VERSION)/COPYING.txt" && \
@@ -128,7 +115,23 @@ actions BuildOSXPackage
128115 ( cd doc && ./genhtml.sh ) && \
129116 cp doc/faq.html "HandBrake $(HB_VERSION)/FAQ.html" && \
130117 cp -r HandBrake.app "HandBrake $(HB_VERSION)" && \
131- zip -9 -r $(1 ) "HandBrake $(HB_VERSION)" && \
118+ zip -9 -r $(< ) "HandBrake $(HB_VERSION)" && \
132119 rm -rf "HandBrake $(HB_VERSION)"
133120}
134121
122+ rule SystemLibraries
123+ {
124+ LINKLIBS on [ FAppendSuffix $(<) : $(SUFEXE) ] += $(>) ;
125+ }
126+
127+ # Jambase's ObjectHdrs doesn't seem to work when ObjectHdrs is called
128+ # several times on a file, and it doesn't works for asm files. Fixed
129+ # here.
130+ rule ObjectHdrs
131+ {
132+ local s = [ FGristFiles $(<:S=$(SUFOBJ)) ] ;
133+ HDRS on $(s) += $(>) ;
134+ ASHDRS on $(s) += [ FIncludes $(>) ] ;
135+ CCHDRS on $(s) += [ FIncludes $(>) ] ;
136+ }
137+
0 commit comments