diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2009-04-21 22:45:09 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2009-04-21 22:45:09 +0000 |
| commit | c9a09238fc44898b57cbaaa43f1fb426cbe961f9 (patch) | |
| tree | 1ec2491bffad2af84c72af4cc63be058b99c8d3c /makefiles/Makefile.top | |
| parent | 1cdd40efb914da8ebaadaa8ffde9b57e2a06b7d7 (diff) | |
| download | buildsystem-c9a09238fc44898b57cbaaa43f1fb426cbe961f9.tar.gz buildsystem-c9a09238fc44898b57cbaaa43f1fb426cbe961f9.tar.bz2 | |
Ensure consistency between static and shared library names.
svn path=/trunk/tools/buildsystem/; revision=7218
Diffstat (limited to 'makefiles/Makefile.top')
| -rw-r--r-- | makefiles/Makefile.top | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/makefiles/Makefile.top b/makefiles/Makefile.top index 2501fa6..379e6b2 100644 --- a/makefiles/Makefile.top +++ b/makefiles/Makefile.top @@ -180,7 +180,7 @@ ifeq ($(findstring lib,$(COMPONENT_TYPE)),lib) SONAME := $(SHAREDLIBNAME).$(major-version) OUTPUT := $(BUILDDIR)/$(SHAREDLIBNAME).$(COMPONENT_VERSION) else - OUTPUT := $(BUILDDIR)/lib$(COMPONENT)$(major-version)$(LIBEXT) + OUTPUT := $(BUILDDIR)/lib$(COMPONENT)$(LIBEXT) endif else OUTPUT := $(BUILDDIR)/$(COMPONENT)$(EXEEXT) @@ -442,11 +442,7 @@ $(eval $(foreach SOURCE,$(filter %.cmhg,$(SOURCES)), \ ifeq ($(WANT_TEST),yes) ifeq ($(findstring lib,$(COMPONENT_TYPE)),lib) TESTLIB := $(OUTPUT) - ifeq ($(findstring lib-shared,$(COMPONENT_TYPE)),lib-shared) - TESTLDFLAGS += -L$(BUILDDIR)/ -l$(COMPONENT) - else - TESTLDFLAGS += -L$(BUILDDIR)/ -l$(COMPONENT)$(major-version) - endif + TESTLDFLAGS += -L$(BUILDDIR)/ -l$(COMPONENT) endif TESTCFLAGS += $(CFLAGS) |