[librsvg/nmake: 6/6] Move config.h.win32.in to win32/



commit 3eea952080c5a6190500608cc3d3da891f47d31e
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Sat Jun 29 00:33:55 2019 +0800

    Move config.h.win32.in to win32/
    
    Make things more consolidated.

 Makefile.am                                  | 2 --
 configure.ac                                 | 2 +-
 win32/Makefile.am                            | 2 ++
 config.h.win32.in => win32/config.h.win32.in | 0
 win32/generate-msvc.mak                      | 4 ++--
 5 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 522583cb..487d130c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -273,8 +273,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 5b2fd7c2..42a8d88b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -395,7 +395,7 @@ tests/Makefile
 tools/Makefile
 doc/Makefile
 doc/version.xml
-config.h.win32
+win32/config.h.win32
 win32/Makefile
 po/Makefile.in
 ])
diff --git a/win32/Makefile.am b/win32/Makefile.am
index b37f787d..cf08d89e 100644
--- a/win32/Makefile.am
+++ b/win32/Makefile.am
@@ -1,5 +1,7 @@
 EXTRA_DIST = \
        build-rules-msvc.mak    \
+       config.h.win32.in       \
+       config.h.win32          \
        config-msvc.mak         \
        create-lists.bat        \
        create-lists-msvc.mak   \
diff --git a/config.h.win32.in b/win32/config.h.win32.in
similarity index 100%
rename from config.h.win32.in
rename to win32/config.h.win32.in
diff --git a/win32/generate-msvc.mak b/win32/generate-msvc.mak
index d9652703..e3dc005a 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 $** $@
 
@@ -28,4 +28,4 @@ $(librsvg_real_extra_pub_HDRS)        \
 $(librsvg_real_SRCS)
        @if exist $@ del $@
        @for %%s in ($(librsvg_real_pub_HDRS) $(librsvg_real_extra_pub_HDRS)) do echo %%s >> $@
-       @for %%s in ($(librsvg_real_SRCS)) do @if "%%~xs" == ".c" echo %%s >> $@
\ No newline at end of file
+       @for %%s in ($(librsvg_real_SRCS)) do @if "%%~xs" == ".c" echo %%s >> $@


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]