diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2019-06-29 00:33:55 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2019-07-01 23:52:51 +0800 |
| commit | ad0b367a2a31c425810c0d5c448dbf9f1b37f00f (patch) | |
| tree | d12f2d26a9ca747f8cd2a973c2ddb6722c8c4431 | |
| parent | 0a19d08a4f55abb307e7a89a2ece50f3e050a1c3 (diff) | |
| download | librsvg-ad0b367a2a31c425810c0d5c448dbf9f1b37f00f.tar.gz | |
Move config.h.win32.in to win32/
Make things more consolidated.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | win32/Makefile.am | 4 | ||||
| -rw-r--r-- | win32/README.txt | 2 | ||||
| -rw-r--r-- | win32/config.h.win32.in (renamed from config.h.win32.in) | 0 | ||||
| -rw-r--r-- | win32/generate-msvc.mak | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 9a44480f..9480af35 100644 --- a/Makefile.am +++ b/Makefile.am @@ -285,8 +285,6 @@ EXTRA_DIST = \ gtk-doc.make \ Rsvg-2.0-custom.vala \ Rsvg-2.0.metadata \ - config.h.win32.in \ - config.h.win32 \ rsvg.symbols \ glib-tap.mk \ tap-driver.sh \ diff --git a/configure.ac b/configure.ac index 76421681..3605aaf5 100644 --- a/configure.ac +++ b/configure.ac @@ -396,8 +396,8 @@ tests/Makefile tools/Makefile doc/Makefile doc/version.xml -config.h.win32 win32/Makefile +win32/config.h.win32 win32/config-msvc.mak po/Makefile.in ]) diff --git a/win32/Makefile.am b/win32/Makefile.am index 2ec0c6a8..c3067577 100644 --- a/win32/Makefile.am +++ b/win32/Makefile.am @@ -1,7 +1,9 @@ EXTRA_DIST = \ build-rules-msvc.mak \ - config-msvc.mak.in \ + config.h.win32.in \ + config.h.win32 \ config-msvc.mak \ + config-msvc.mak.in \ create-lists.bat \ create-lists-msvc.mak \ detectenv-msvc.mak \ diff --git a/win32/README.txt b/win32/README.txt index 0a1efcfb..cc31bba5 100644 --- a/win32/README.txt +++ b/win32/README.txt @@ -48,7 +48,7 @@ and save those files without the .in file extension: (open file) -> (save as file)
=========== ==============
config-msvc.mak.in -> config-msvc.mak
-$(srcroot)\config.h.win32.in -> $(srcroot)\config.h.win32
+config.h.win32.in -> config.h.win32
$(srcroot)\librsvg\rsvg-features.h.in -> $(srcroot)\librsvg\rsvg-features.h
From this directory in a Visual Studio command prompt, run the following:
diff --git a/config.h.win32.in b/win32/config.h.win32.in index 2dce7ddd..2dce7ddd 100644 --- a/config.h.win32.in +++ b/win32/config.h.win32.in diff --git a/win32/generate-msvc.mak b/win32/generate-msvc.mak index b7e4a6bc..b010e1df 100644 --- a/win32/generate-msvc.mak +++ b/win32/generate-msvc.mak @@ -4,7 +4,7 @@ # one is maintaining the NMake build files. # Copy the pre-defined config.h.win32 -$(OUTDIR)\librsvg\config.h: ..\config.h.win32 +$(OUTDIR)\librsvg\config.h: config.h.win32 @if not exist $(@D) $(MAKE) /f Makefile.vc CFG=$(CFG) $(@D) @-copy $** $@ |