diff options
| author | kraxel <kraxel> | 2008-06-09 14:56:36 +0000 |
|---|---|---|
| committer | kraxel <kraxel> | 2008-06-09 14:56:36 +0000 |
| commit | 8dae03a9fefea29e94a8e97f461260522274164a (patch) | |
| tree | 6d64ea89536eb6a0d7a2f0a71a6d9f9bb31ad397 /mk/Compile.mk | |
| parent | adbf9e28624a774ba5e488bf7a231dcfb5e2aff6 (diff) | |
| download | fbida-8dae03a9fefea29e94a8e97f461260522274164a.tar.gz | |
- fix build error.
- build system updates.
- bump version for release.
Diffstat (limited to 'mk/Compile.mk')
| -rw-r--r-- | mk/Compile.mk | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/mk/Compile.mk b/mk/Compile.mk index da14d58..4ab59f4 100644 --- a/mk/Compile.mk +++ b/mk/Compile.mk @@ -21,6 +21,7 @@ depfile = mk/$(subst /,_,$*).dep depfiles = mk/*.dep compile_c = $(CC) $(CFLAGS) -Wp,-MD,$(tmpdep) -c -o $@ $< +compile_c_pic = $(CC) $(CFLAGS) -fPIC -Wp,-MD,$(tmpdep) -c -o $@ $< compile_cc = $(CXX) $(CXXFLAGS) -Wp,-MD,$(tmpdep) -c -o $@ $< fixup_deps = sed -e "s|.*\.o:|$@:|" < $(tmpdep) > $(depfile) && rm -f $(tmpdep) cc_makedirs = mkdir -p $(dir $@) $(dir $(depfile)) @@ -35,6 +36,7 @@ msgfmt_po = msgfmt -o $@ $< # non-verbose output ifeq ($(verbose),no) echo_compile_c = echo " CC " $@ + echo_compile_c_pic = echo " CC " $@ echo_compile_cc = echo " CXX " $@ echo_link_app = echo " LD " $@ echo_link_so = echo " LD " $@ @@ -43,6 +45,7 @@ ifeq ($(verbose),no) echo_msgfmt_po = echo " MSGFMT " $@ else echo_compile_c = echo $(compile_c) + echo_compile_c = echo $(compile_c_pic) echo_compile_cc = echo $(compile_cc) echo_link_app = echo $(link_app) echo_link_so = echo $(link_so) @@ -57,6 +60,12 @@ endif @$(compile_c) @$(fixup_deps) +%.opic: %.c + @$(cc_makedirs) + @$(echo_compile_c_pic) + @$(compile_c_pic) + @$(fixup_deps) + %.o: %.cc @$(cc_makedirs) @$(echo_compile_cc) @@ -70,13 +79,18 @@ endif @$(fixup_deps) +%: %.o + @$(echo_link_app) + @$(link_app) + %.so: %.o @$(echo_link_so) @$(link_so) -%: %.o - @$(echo_link_app) - @$(link_app) +%.a: %.o + @$(echo_ar_lib) + @$(ar_lib) + %.moc : %.h @$(echo_moc_h) |