diff options
| author | lloyd <[email protected]> | 2009-11-20 01:44:15 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2009-11-20 01:44:15 +0000 |
| commit | 7b3ed530a124f4dc47fafe98af3d76f430df878a (patch) | |
| tree | db549532130c11ebdf0ef922f676421fe1aa7106 /src/build-data | |
| parent | 5ea8667cecbf51dcc377b0e404cd664dae58a928 (diff) | |
Fix nmake's distclean and DLL inking. Add static lib to InnoSetup
Diffstat (limited to 'src/build-data')
| -rw-r--r-- | src/build-data/botan.iss.in | 6 | ||||
| -rw-r--r-- | src/build-data/makefile/nmake.in | 11 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/build-data/botan.iss.in b/src/build-data/botan.iss.in index ee8229f3f..c0bc97fa2 100644 --- a/src/build-data/botan.iss.in +++ b/src/build-data/botan.iss.in @@ -5,18 +5,18 @@ AppName=Botan AppVerName=Botan %{version} AppPublisher=Jack Lloyd +AppCopyright=Copyright (C) 1999-2009 Jack Lloyd and others AppPublisherURL=http://botan.randombit.net/ AppVersion=%{version} DefaultDirName={pf}\botan DefaultGroupName=botan -AppCopyright=Copyright (C) 1999-2009 Jack Lloyd and others - SolidCompression=yes OutputDir=. [Files] -Source: "..\libbotan.dll"; DestDir: "{app}" +Source: "..\botan.dll"; DestDir: "{app}" +Source: "..\botan.lib"; DestDir: "{app}" Source: "include\botan\*"; DestDir: "{app}\include\botan" diff --git a/src/build-data/makefile/nmake.in b/src/build-data/makefile/nmake.in index c8f089a1d..2604a3459 100644 --- a/src/build-data/makefile/nmake.in +++ b/src/build-data/makefile/nmake.in @@ -28,6 +28,7 @@ INSTALL_CMD = %{install_cmd_exec} MKDIR = @md MKDIR_INSTALL = @md RM = @del /Q +RM_R = $(RM) /S RMDIR = @rmdir ### File Lists @@ -46,8 +47,9 @@ CHECK_FLAGS = $(CHECK_OPT) $(LANG_FLAGS) $(WARN_FLAGS) LIBRARIES = $(DLL) -LIBNAME = libbotan +LIBNAME = botan DLL = $(LIBNAME).%{so_suffix} +STATIC_LIB = $(LIBNAME).%{static_suffix} all: $(LIBRARIES) @@ -58,7 +60,7 @@ all: $(LIBRARIES) ### Link Commands $(CHECK): $(LIBRARIES) $(CHECKOBJS) - link /OUT:[email protected] $(CHECKOBJS) $(DLL) $(LINK_TO) + $(CXX) /Fe$@ $(CHECKOBJS) $(STATIC_LIB) $(LINK_TO) $(DLL): $(LIBOBJS) $(SO_LINK_CMD) /Febotan $(LIBOBJS) $(LINK_TO) @@ -69,12 +71,11 @@ clean: $(RM) $(LIBRARIES) $(CHECK) distclean: clean - $(RM) %{build_dir}\build.h - $(RM) %{build_dir}\include\botan\* + $(RM_R) %{build_dir} $(RMDIR) %{build_dir}\include\botan %{build_dir}\include $(RMDIR) %{build_dir}\lib %{build_dir}\checks $(RMDIR) %{build_dir} - $(RM) Makefile + $(RM) Makefile $(LIBNAME).* $(CHECK).* ### Install Commands install: $(LIBRARIES) |