OSDN -- 開發和下載開源軟體
繁體中文翻譯狀態 translation status for zh-tw
  • R/O
  • SSH
  • HTTPS

nes: 提交


Commit MetaInfo

修訂366 (tree)
時間2007-12-07 10:56:52
作者okasaka

Log Message

(Makefile) : Refine build environment.

Change Summary

差異

--- es/trunk/cmd/Makefile.in (revision 365)
+++ es/trunk/cmd/Makefile.in (revision 366)
@@ -39,7 +39,7 @@
3939 locationClient$(EXEEXT) eventManager$(EXEEXT) \
4040 eventManagerClient$(EXEEXT) console$(EXEEXT) \
4141 consoleClient$(EXEEXT) upcallTest$(EXEEXT) \
42- upcallTestClient$(EXEEXT) fontconfig$(EXEEXT)
42+ upcallTestClient$(EXEEXT) fontconfig$(EXEEXT) newlib$(EXEEXT)
4343 subdir = .
4444 DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
4545 $(srcdir)/Makefile.in $(top_srcdir)/configure config.guess \
@@ -112,6 +112,10 @@
112112 main_OBJECTS = $(am_main_OBJECTS)
113113 main_LDADD = $(LDADD)
114114 main_DEPENDENCIES = ../os/libes++/libes++.a
115+am_newlib_OBJECTS = newlib.$(OBJEXT)
116+newlib_OBJECTS = $(am_newlib_OBJECTS)
117+newlib_LDADD = $(LDADD)
118+newlib_DEPENDENCIES = ../os/libes++/libes++.a
115119 am_server_OBJECTS = server.$(OBJEXT)
116120 server_OBJECTS = $(am_server_OBJECTS)
117121 server_LDADD = $(LDADD)
@@ -142,15 +146,16 @@
142146 $(eventManagerClient_SOURCES) $(expat_SOURCES) \
143147 $(fontconfig_SOURCES) $(hello_SOURCES) $(location_SOURCES) \
144148 $(nodist_location_SOURCES) $(locationClient_SOURCES) \
145- $(main_SOURCES) $(server_SOURCES) $(upcallTest_SOURCES) \
146- $(upcallTestClient_SOURCES)
149+ $(main_SOURCES) $(newlib_SOURCES) $(server_SOURCES) \
150+ $(upcallTest_SOURCES) $(upcallTestClient_SOURCES)
147151 DIST_SOURCES = $(binder_SOURCES) $(binderClient_SOURCES) \
148152 $(cairo_SOURCES) $(client_SOURCES) $(console_SOURCES) \
149153 $(consoleClient_SOURCES) $(eventManager_SOURCES) \
150154 $(eventManagerClient_SOURCES) $(expat_SOURCES) \
151155 $(fontconfig_SOURCES) $(hello_SOURCES) $(location_SOURCES) \
152- $(locationClient_SOURCES) $(main_SOURCES) $(server_SOURCES) \
153- $(upcallTest_SOURCES) $(upcallTestClient_SOURCES)
156+ $(locationClient_SOURCES) $(main_SOURCES) $(newlib_SOURCES) \
157+ $(server_SOURCES) $(upcallTest_SOURCES) \
158+ $(upcallTestClient_SOURCES)
154159 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
155160 html-recursive info-recursive install-data-recursive \
156161 install-dvi-recursive install-exec-recursive \
@@ -307,6 +312,8 @@
307312 upcallTest_SOURCES = upcallTest.cpp
308313 upcallTestClient_SOURCES = upcallTestClient.cpp
309314 fontconfig_SOURCES = fontconfig.cpp
315+newlib_SOURCES = newlib.cpp
316+CLEANFILES = $(BUILT_SOURCES) $(nodist_location_SOURCES) $(nodist_eventManager_SOURCES)
310317 all: $(BUILT_SOURCES)
311318 $(MAKE) $(AM_MAKEFLAGS) all-recursive
312319
@@ -390,6 +397,9 @@
390397 main$(EXEEXT): $(main_OBJECTS) $(main_DEPENDENCIES)
391398 @rm -f main$(EXEEXT)
392399 $(CXXLINK) $(main_OBJECTS) $(main_LDADD) $(LIBS)
400+newlib$(EXEEXT): $(newlib_OBJECTS) $(newlib_DEPENDENCIES)
401+ @rm -f newlib$(EXEEXT)
402+ $(CXXLINK) $(newlib_OBJECTS) $(newlib_LDADD) $(LIBS)
393403 server$(EXEEXT): $(server_OBJECTS) $(server_DEPENDENCIES)
394404 @rm -f server$(EXEEXT)
395405 $(CXXLINK) $(server_OBJECTS) $(server_LDADD) $(LIBS)
@@ -423,6 +433,7 @@
423433 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/location.Po@am__quote@
424434 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/locationClient.Po@am__quote@
425435 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
436+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/newlib.Po@am__quote@
426437 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/server.Po@am__quote@
427438 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/upcallTest.Po@am__quote@
428439 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/upcallTestClient.Po@am__quote@
@@ -752,6 +763,7 @@
752763 mostlyclean-generic:
753764
754765 clean-generic:
766+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
755767
756768 distclean-generic:
757769 -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -855,7 +867,7 @@
855867 echo "Info;" >> $@;
856868
857869 clean-local:
858- -rm -f $(BUILT_SOURCES)
870+ -rm -f *.map
859871 # Tell versions [3.59,3.63) of GNU make to not export all variables.
860872 # Otherwise a system limit (for SysV at least) may be exceeded.
861873 .NOEXPORT:
--- es/trunk/cmd/testsuite/Makefile.in (revision 365)
+++ es/trunk/cmd/testsuite/Makefile.in (revision 366)
@@ -35,9 +35,8 @@
3535 build_triplet = @build@
3636 host_triplet = @host@
3737 target_triplet = @target@
38-TESTS = main$(EXEEXT) start$(EXEEXT) binder$(EXEEXT) location$(EXEEXT) \
39- eventManager$(EXEEXT) console$(EXEEXT) upcallTest$(EXEEXT)
40-noinst_PROGRAMS = $(am__EXEEXT_2)
38+noinst_PROGRAMS = $(am__EXEEXT_1)
39+TESTS = $(am__EXEEXT_1)
4140 subdir = testsuite
4241 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
4342 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -48,8 +47,7 @@
4847 CONFIG_CLEAN_FILES =
4948 am__EXEEXT_1 = main$(EXEEXT) start$(EXEEXT) binder$(EXEEXT) \
5049 location$(EXEEXT) eventManager$(EXEEXT) console$(EXEEXT) \
51- upcallTest$(EXEEXT)
52-am__EXEEXT_2 = $(am__EXEEXT_1)
50+ upcallTest$(EXEEXT) newlib$(EXEEXT)
5351 PROGRAMS = $(noinst_PROGRAMS)
5452 am_binder_OBJECTS = binder.$(OBJEXT)
5553 binder_OBJECTS = $(am_binder_OBJECTS)
@@ -76,6 +74,11 @@
7674 main_LDADD = $(LDADD)
7775 main_DEPENDENCIES = ../../os/fs/fat/libesfat.a \
7876 ../../os/kernel/libeskernel.a ../../os/libes++/libessup++.a
77+am_newlib_OBJECTS = newlib.$(OBJEXT)
78+newlib_OBJECTS = $(am_newlib_OBJECTS)
79+newlib_LDADD = $(LDADD)
80+newlib_DEPENDENCIES = ../../os/fs/fat/libesfat.a \
81+ ../../os/kernel/libeskernel.a ../../os/libes++/libessup++.a
7982 am_start_OBJECTS = start.$(OBJEXT)
8083 start_OBJECTS = $(am_start_OBJECTS)
8184 start_LDADD = $(LDADD)
@@ -96,11 +99,11 @@
9699 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
97100 -o $@
98101 SOURCES = $(binder_SOURCES) $(console_SOURCES) $(eventManager_SOURCES) \
99- $(location_SOURCES) $(main_SOURCES) $(start_SOURCES) \
100- $(upcallTest_SOURCES)
102+ $(location_SOURCES) $(main_SOURCES) $(newlib_SOURCES) \
103+ $(start_SOURCES) $(upcallTest_SOURCES)
101104 DIST_SOURCES = $(binder_SOURCES) $(console_SOURCES) \
102105 $(eventManager_SOURCES) $(location_SOURCES) $(main_SOURCES) \
103- $(start_SOURCES) $(upcallTest_SOURCES)
106+ $(newlib_SOURCES) $(start_SOURCES) $(upcallTest_SOURCES)
104107 DATA = $(noinst_DATA)
105108 ETAGS = etags
106109 CTAGS = ctags
@@ -209,7 +212,7 @@
209212 LDADD = ../../os/fs/fat/libesfat.a ../../os/kernel/libeskernel.a ../../os/libes++/libessup++.a -lfreetype
210213 SUFFIXES = .img .gz
211214 TESTS_ENVIRONMENT = $(srcdir)/testLoader
212-noinst_SCRIPTS = $(TESTS)
215+noinst_SCRIPTS = main start binder location eventManager console upcallTest newlib
213216 noinst_DATA = disk.img \
214217 main.img \
215218 start.img \
@@ -217,7 +220,8 @@
217220 location.img \
218221 eventManager.img \
219222 console.img \
220- upcallTest.img
223+ upcallTest.img \
224+ newlib.img
221225
222226 CLEANFILES = $(noinst_DATA) $(noinst_SCRIPTS)
223227 AM_LDFLAGS = -Wl,--section-start,".init"=0x81000000,-static,--omagic,--cref,-Map,$@.map -L$(prefix)/lib
@@ -228,6 +232,7 @@
228232 eventManager_SOURCES = eventManager.cpp
229233 console_SOURCES = console.cpp
230234 upcallTest_SOURCES = upcallTest.cpp
235+newlib_SOURCES = newlib.cpp
231236 AM_CPPFLAGS = \
232237 -I- \
233238 -I../../include \
@@ -287,6 +292,9 @@
287292 main$(EXEEXT): $(main_OBJECTS) $(main_DEPENDENCIES)
288293 @rm -f main$(EXEEXT)
289294 $(CXXLINK) $(main_OBJECTS) $(main_LDADD) $(LIBS)
295+newlib$(EXEEXT): $(newlib_OBJECTS) $(newlib_DEPENDENCIES)
296+ @rm -f newlib$(EXEEXT)
297+ $(CXXLINK) $(newlib_OBJECTS) $(newlib_LDADD) $(LIBS)
290298 start$(EXEEXT): $(start_OBJECTS) $(start_DEPENDENCIES)
291299 @rm -f start$(EXEEXT)
292300 $(CXXLINK) $(start_OBJECTS) $(start_LDADD) $(LIBS)
@@ -305,6 +313,7 @@
305313 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eventManager.Po@am__quote@
306314 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/location.Po@am__quote@
307315 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
316+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/newlib.Po@am__quote@
308317 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/start.Po@am__quote@
309318 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/upcallTest.Po@am__quote@
310319
@@ -575,10 +584,12 @@
575584
576585 %.img : %.elf
577586 $(host_alias)-objcopy -O binary $< $@
578- $(srcdir)/makeScript "`pwd`" $(*F)
579587
588+% :: %.elf
589+ $(srcdir)/makeScript "`pwd`" $(srcdir) $@
590+
580591 clean-local:
581- -rm -f *.map *.log
592+ -rm -f *.map
582593
583594 disk.img: disk.img.gz
584595 gunzip -c $< > $@
--- es/trunk/cmd/testsuite/Makefile.am (revision 365)
+++ es/trunk/cmd/testsuite/Makefile.am (revision 366)
@@ -4,16 +4,18 @@
44
55 %.img : %.elf
66 $(host_alias)-objcopy -O binary $< $@
7- $(srcdir)/makeScript "`pwd`" $(*F)
87
8+% :: %.elf
9+ $(srcdir)/makeScript "`pwd`" $(srcdir) $@
10+
911 TESTS_ENVIRONMENT = $(srcdir)/testLoader
1012
11-TESTS = main start binder location eventManager console upcallTest
13+noinst_SCRIPTS = main start binder location eventManager console upcallTest newlib
1214
13-noinst_SCRIPTS = $(TESTS)
14-
1515 noinst_PROGRAMS = $(noinst_SCRIPTS)
1616
17+TESTS = $(noinst_SCRIPTS)
18+
1719 noinst_DATA = disk.img \
1820 main.img \
1921 start.img \
@@ -21,12 +23,13 @@
2123 location.img \
2224 eventManager.img \
2325 console.img \
24- upcallTest.img
26+ upcallTest.img \
27+ newlib.img
2528
2629 CLEANFILES = $(noinst_DATA) $(noinst_SCRIPTS)
2730
2831 clean-local:
29- -rm -f *.map *.log
32+ -rm -f *.map
3033
3134 AM_LDFLAGS = -Wl,--section-start,".init"=0x81000000,-static,--omagic,--cref,-Map,$@.map -L$(prefix)/lib
3235
@@ -44,6 +47,8 @@
4447
4548 upcallTest_SOURCES = upcallTest.cpp
4649
50+newlib_SOURCES = newlib.cpp
51+
4752 disk.img: disk.img.gz
4853 gunzip -c $< > $@
4954 vformat $@
--- es/trunk/cmd/Makefile.am (revision 365)
+++ es/trunk/cmd/Makefile.am (revision 366)
@@ -15,9 +15,13 @@
1515 echo -n "InfoSize = sizeof" $(*F) >> $@;
1616 echo "Info;" >> $@;
1717
18-noinst_PROGRAMS = main hello cairo expat server client binder binderClient location locationClient \
19- eventManager eventManagerClient console consoleClient upcallTest upcallTestClient \
20- fontconfig
18+noinst_PROGRAMS = \
19+ main hello cairo expat server client binder binderClient \
20+ location locationClient \
21+ eventManager eventManagerClient \
22+ console consoleClient \
23+ upcallTest upcallTestClient \
24+ fontconfig newlib
2125
2226 AM_LDFLAGS = -v -static -Wl,--no-omagic,-Map,$@.map,--cref -L$(prefix)/lib
2327 AM_CPPFLAGS = -I- \
@@ -71,5 +75,9 @@
7175
7276 fontconfig_SOURCES = fontconfig.cpp
7377
78+newlib_SOURCES = newlib.cpp
79+
80+CLEANFILES = $(BUILT_SOURCES) $(nodist_location_SOURCES) $(nodist_eventManager_SOURCES)
81+
7482 clean-local:
75- -rm -f $(BUILT_SOURCES)
83+ -rm -f *.map
Show on old repository browser