Commit ec20e494503d08aeccc13f2e3e5aead08092b33d
1 parent
7884e9b5
build fixes
git-svn-id: svn+q:///qpdf/trunk@763 71b93d88-0707-0410-a8cf-f5a4172ac649
Showing
3 changed files
with
16 additions
and
5 deletions
make/gcc-linux.mk
| @@ -35,15 +35,15 @@ endef | @@ -35,15 +35,15 @@ endef | ||
| 35 | 35 | ||
| 36 | define libcompile | 36 | define libcompile |
| 37 | $(CXX) $(CPPFLAGS) $(CXXFLAGS) -fpic \ | 37 | $(CXX) $(CPPFLAGS) $(CXXFLAGS) -fpic \ |
| 38 | - $(call depflags,$(basename $(call src_to_obj,$(1)))) \ | 38 | + $(call depflags,$(basename $(call src_to_lobj,$(1)))) \ |
| 39 | $(foreach I,$(2),-I$(I)) \ | 39 | $(foreach I,$(2),-I$(I)) \ |
| 40 | - -c $(1) -o $(call src_to_obj,$(1)) | 40 | + -c $(1) -o $(call src_to_lobj,$(1)) |
| 41 | endef | 41 | endef |
| 42 | define c_libcompile | 42 | define c_libcompile |
| 43 | $(CC) $(CPPFLAGS) $(CXXFLAGS) -fpic \ | 43 | $(CC) $(CPPFLAGS) $(CXXFLAGS) -fpic \ |
| 44 | $(call depflags,$(basename $(call c_src_to_lobj,$(1)))) \ | 44 | $(call depflags,$(basename $(call c_src_to_lobj,$(1)))) \ |
| 45 | $(foreach I,$(2),-I$(I)) \ | 45 | $(foreach I,$(2),-I$(I)) \ |
| 46 | - -c $(1) -o $(call c_src_to_obj,$(1)) | 46 | + -c $(1) -o $(call c_src_to_lobj,$(1)) |
| 47 | endef | 47 | endef |
| 48 | 48 | ||
| 49 | 49 |
make/libtool.mk
| @@ -41,7 +41,7 @@ endef | @@ -41,7 +41,7 @@ endef | ||
| 41 | # Usage: $(call c_compile,src,includes) | 41 | # Usage: $(call c_compile,src,includes) |
| 42 | define c_compile | 42 | define c_compile |
| 43 | $(CC) $(CPPFLAGS) $(CFLAGS) \ | 43 | $(CC) $(CPPFLAGS) $(CFLAGS) \ |
| 44 | - $(call depflags,$(basename $(call src_to_obj,$(1)))) \ | 44 | + $(call depflags,$(basename $(call c_src_to_obj,$(1)))) \ |
| 45 | $(foreach I,$(2),-I$(I)) \ | 45 | $(foreach I,$(2),-I$(I)) \ |
| 46 | -c $(1) -o $(call c_src_to_obj,$(1)) | 46 | -c $(1) -o $(call c_src_to_obj,$(1)) |
| 47 | endef | 47 | endef |
| @@ -57,6 +57,17 @@ define libcompile | @@ -57,6 +57,17 @@ define libcompile | ||
| 57 | $(call fixdeps,$(basename $(call src_to_obj,$(1)))) | 57 | $(call fixdeps,$(basename $(call src_to_obj,$(1)))) |
| 58 | endef | 58 | endef |
| 59 | 59 | ||
| 60 | +# 1 2 | ||
| 61 | +# Usage: $(call libcompile,src,includes) | ||
| 62 | +define c_libcompile | ||
| 63 | + $(LIBTOOL) --quiet --mode=compile \ | ||
| 64 | + $(CC) $(CPPFLAGS) $(CXXFLAGS) \ | ||
| 65 | + $(call libdepflags,$(basename $(call c_src_to_obj,$(1)))) \ | ||
| 66 | + $(foreach I,$(2),-I$(I)) \ | ||
| 67 | + -c $(1) -o $(call c_src_to_obj,$(1)); \ | ||
| 68 | + $(call fixdeps,$(basename $(call src_to_obj,$(1)))) | ||
| 69 | +endef | ||
| 70 | + | ||
| 60 | # 1 2 | 71 | # 1 2 |
| 61 | # Usage: $(call makeslib,objs,library) | 72 | # Usage: $(call makeslib,objs,library) |
| 62 | define makeslib | 73 | define makeslib |
make/mingw.mk