2010-11-15 Marcus Brinkmann <mb@g10code.com>

	* conf-w32ce-msc/stdint.h: New file.
	* conf-w32ce-msc/build.mk (conf_sources): Add stdint.h.
	* conf-w32ce-msc/build.mk (copy-static-source): Revert last change.

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 1ed8d522f00a76851a20bd820c6a046d8fe3840d..87cc8a399641cc6c1383bbbb94020bb42d9a268a 100644 (file)
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-15  Marcus Brinkmann  <mb@g10code.com>
+
+       * conf-w32ce-msc/stdint.h: New file.
+       * conf-w32ce-msc/build.mk (conf_sources): Add stdint.h.
+       * conf-w32ce-msc/build.mk (copy-static-source): Revert last change.
+
 2010-11-15  Werner Koch  <wk@g10code.com>
 
        * conf-w32ce-msc/build.mk (copy-static-source): Create stdint.h.

diff --git a/contrib/conf-w32ce-msc/build.mk b/contrib/conf-w32ce-msc/build.mk
index 72b683afdaaf373c26c28ad4c528bb8f42af83cc..966b1c86d1b91da2911c2f23cb7984c0abfcc3a6 100755 (executable)
--- a/contrib/conf-w32ce-msc/build.mk
+++ b/contrib/conf-w32ce-msc/build.mk
@@ -202,15 +202,14 @@ objs = \
 # Sources files in this directory inclduing this Makefile
 conf_sources = \
        build.mk \
-       config.h
+       config.h \
+        stdint.h
 
 # Source files built by running the standard build system.
 built_sources = \
        gpgme.h         \
        status-table.h
 
-my_stdint = $(targetsrc)/libassuan/src/stdint.h
-
 copy-static-source:
        @if [ ! -f ./gpgme.c ]; then \
            echo "Please cd to the src/ directory first"; \
@@ -219,14 +218,6 @@ copy-static-source:
        cp -t $(targetsrc)/gpgme/src $(sources);
        cd ../contrib/conf-w32ce-msc ; \
             cp -t $(targetsrc)/gpgme/src $(conf_sources)
-       @echo typedef unsigned long long uint64_t;  >$(my_stdint)
-       @echo typedef long long int64_t;           >>$(my_stdint)
-       @echo typedef unsigned int uint32_t;       >>$(my_stdint)
-       @echo typedef int int32_t;                 >>$(my_stdint)
-       @echo typedef unsigned short uint16_t;     >>$(my_stdint)
-       @echo typedef short int16_t;               >>$(my_stdint)
-       @echo typedef unsigned int uintptr_t;      >>$(my_stdint)
-       @echo typedef int intptr_t;                >>$(my_stdint)
 
 copy-built-source:
        @if [ ! -f ./gpgme.h ]; then \

diff --git a/contrib/conf-w32ce-msc/stdint.h b/contrib/conf-w32ce-msc/stdint.h
new file mode 100755 (executable)
index 0000000..0a821b7
--- /dev/null
+++ b/contrib/conf-w32ce-msc/stdint.h
@@ -0,0 +1,9 @@
+typedef unsigned long long uint64_t;
+typedef long long int64_t;
+typedef unsigned int uint32_t;
+typedef int int32_t;
+typedef unsigned short uint16_t;
+typedef short int16_t;
+typedef unsigned int uintptr_t;
+typedef int intptr_t;
+