diff options
| author | Jay Berkenbilt <ejb@ql.org> | 2009-10-11 02:13:28 +0200 |
|---|---|---|
| committer | Jay Berkenbilt <ejb@ql.org> | 2009-10-11 02:13:28 +0200 |
| commit | 9e05a15d7b3ed099fcc605b782c1f0ca6326dde2 (patch) | |
| tree | 6a47263fe221ca0e81d8e4ca393832590caa05ca /external-libs | |
| parent | 64a890db2bfa0e02cbb1458c7e52ed78f1c0b8b8 (diff) | |
| download | qpdf-9e05a15d7b3ed099fcc605b782c1f0ca6326dde2.tar.zst | |
windows fixes
git-svn-id: svn+q:///qpdf/trunk@775 71b93d88-0707-0410-a8cf-f5a4172ac649
Diffstat (limited to 'external-libs')
| -rw-r--r-- | external-libs/build.mk | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/external-libs/build.mk b/external-libs/build.mk index 7c694bbb..9dfa0bce 100644 --- a/external-libs/build.mk +++ b/external-libs/build.mk @@ -1,4 +1,4 @@ -TARGETS_external-libs = external-libs/$(OUTPUT_DIR)/libexternal.a +TARGETS_external-libs = external-libs/$(OUTPUT_DIR)/$(call libname,external) INCLUDES_external-libs = external-libs/zlib external-libs/pcre SRCS_external-libs_zlib = \ @@ -29,9 +29,6 @@ external-libs/$(OUTPUT_DIR)/chartables.c: external-libs/$(OUTPUT_DIR)/$(call bin external-libs/$(OUTPUT_DIR)/$(call binname,dftables) \ external-libs/$(OUTPUT_DIR)/chartables.c -external-libs/$(OUTPUT_DIR)/$(call binname,dftables): - $(CC) -o $@ external-libs/pcre/dftables.c - # ----- OBJS_external-libs_zlib = $(call c_src_to_lobj,$(subst zlib/,,$(SRCS_external-libs_zlib))) @@ -39,9 +36,6 @@ OBJS_external-libs_pcre = $(call c_src_to_lobj,$(subst pcre/,,$(SRCS_external-li OBJS_external-libs = $(OBJS_external-libs_zlib) $(OBJS_external-libs_pcre) -x: - @echo $(call lobj_to_dep,$(OBJS_external-libs)) - ifeq ($(GENDEPS),1) -include $(call lobj_to_dep,$(OBJS_external-libs)) endif @@ -54,3 +48,12 @@ $(OBJS_external-libs_pcre): external-libs/$(OUTPUT_DIR)/%.$(LOBJ): external-libs $(TARGETS_external-libs): $(OBJS_external-libs) $(call makeslib,$(OBJS_external-libs),$(TARGETS_external-libs)) + +OBJS_dftables = $(call c_src_to_obj,external-libs/pcre/dftables.c) + +$(OBJS_dftables): external-libs/pcre/dftables.c + $(call c_compile,$<,) + +external-libs/$(OUTPUT_DIR)/$(call binname,dftables): LIBS= +external-libs/$(OUTPUT_DIR)/$(call binname,dftables): $(OBJS_dftables) + $(call makebin,$(OBJS_dftables),$@) |