Changeset 241

Show
Ignore:
Timestamp:
10/15/05 14:48:19
Author:
ben
Message:

Move all the headers around.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • openpgpsdk/trunk/Makefile

    r236 r241  
    77SUBDIRS=src examples 
    88 
    9 all: Makefiles include/configure.h headers default 
     9all: Makefiles include/openpgpsdk/configure.h headers default 
    1010 
    1111headers: 
    12         cd include && make headers 
     12        cd include/openpgpsdk && make headers 
    1313 
    1414default: 
    …… 
    1717        done 
    1818 
    19 include/configure.h: include/configure.h.template configure 
    20         echo re-run configure 
     19include/openpgpsdk/configure.h: include/openpgpsdk/configure.h.template configure 
     20        echo re-run configure && exit 1 
    2121 
    2222force_depend: 

  • openpgpsdk/trunk/configure

    r193 r241  
    101101fileSubst('src/Makefile','#',''); 
    102102fileSubst('examples/Makefile','#',''); 
    103 fileSubst('include/configure.h','/*','*/'); 
     103fileSubst('include/openpgpsdk/configure.h','/*','*/'); 
    104104 
    105105print "make clean\n"; 

  • openpgpsdk/trunk/examples/Makefile.template

    r233 r241  
    3939        rm -f TAGS 
    4040 
    41 .depend: *.[ch] 
    42         $(CC) $(CFLAGS) -E -MM *.c > .depend 
     41.depend: *.[ch] ../include/openpgpsdk/*.h 
     42        $(CC) $(CFLAGS) -E -M *.c > .depend 
    4343 
    4444force_depend: 
    45         $(CC) $(CFLAGS) -E -MM *.c > .depend 
     45        $(CC) $(CFLAGS) -E -M *.c > .depend 
    4646 
    4747Makefile: Makefile.template ../configure 

  • openpgpsdk/trunk/examples/create-key.c

    r128 r241  
    1 #include "create.h" 
    2 #include "util.h" 
     1#include <openpgpsdk/create.h> 
     2#include <openpgpsdk/util.h> 
    33#include <stdio.h> 
    44 

  • openpgpsdk/trunk/examples/create-signed-key.c

    r146 r241  
    1 #include "create.h" 
    2 #include "util.h" 
    3 #include "signature.h" 
    4 #include "packet-parse.h" 
     1#include <openpgpsdk/create.h> 
     2#include <openpgpsdk/util.h> 
     3#include <openpgpsdk/signature.h> 
     4#include <openpgpsdk/packet-parse.h> 
    55#include <stdio.h> 
    66#include <fcntl.h> 

  • openpgpsdk/trunk/examples/packet-dump.c

    r240 r241  
    1 #include "packet.h" 
    2 #include "packet-parse.h" 
    3 #include "packet-show.h" 
    4 #include "configure.h" 
    5 #include "util.h" 
    6 #include "lists.h" 
    7 #include "ops_errors.h" 
     1#include <openpgpsdk/packet.h> 
     2#include <openpgpsdk/packet-parse.h> 
     3#include <openpgpsdk/packet-show.h> 
     4#include <openpgpsdk/configure.h> 
     5#include <openpgpsdk/util.h> 
     6#include <openpgpsdk/errors.h> 
    87#include <openpgpsdk/armour.h> 
    9 #include "crypto.h" 
     8#include <openpgpsdk/crypto.h> 
    109 
    1110#include <unistd.h> 

  • openpgpsdk/trunk/examples/verify.c

    r240 r241  
    1 #include "packet.h" 
    2 #include "packet-parse.h" 
    3 #include "util.h" 
     1#include <openpgpsdk/packet.h> 
     2#include <openpgpsdk/packet-parse.h> 
     3#include <openpgpsdk/util.h> 
    44#include <openpgpsdk/accumulate.h> 
    5 #include "keyring.h" 
    6 #include "validate.h" 
     5#include <openpgpsdk/keyring.h> 
     6#include <openpgpsdk/validate.h> 
    77#include <unistd.h> 
    88#include <string.h> 

  • openpgpsdk/trunk/examples/verify2.c

    r240 r241  
    1 #include "packet.h" 
    2 #include "packet-parse.h" 
    3 #include "util.h" 
     1#include <openpgpsdk/packet.h> 
     2#include <openpgpsdk/packet-parse.h> 
     3#include <openpgpsdk/util.h> 
    44#include <openpgpsdk/accumulate.h> 
    5 #include "keyring.h" 
    6 #include "validate.h" 
     5#include <openpgpsdk/keyring.h> 
    76#include <openpgpsdk/armour.h> 
    8 #include "crypto.h" 
    9 #include "signature.h" 
     7#include <openpgpsdk/crypto.h> 
     8#include <openpgpsdk/signature.h> 
    109#include <unistd.h> 
    1110#include <string.h> 

  • openpgpsdk/trunk/include/openpgpsdk/Makefile

    r222 r241  
    22 
    33top: 
    4         cd .. && make 
     4        cd ../.. && make 
    55 
    66headers: packet-show-cast.h 
    77 
    8 packet-show-cast.h: packet-show.cast ../util/caster.pl 
    9         ../util/caster.pl packet-show.cast packet-show-cast.h 
     8packet-show-cast.h: packet-show.cast ../../util/caster.pl 
     9        ../../util/caster.pl packet-show.cast packet-show-cast.h 

  • openpgpsdk/trunk/include/openpgpsdk/packet.h

    r238 r241  
    1111#include <openssl/bn.h> 
    1212#include "types.h" 
    13 #include "ops_errors.h" 
     13#include "errors.h" 
    1414 
    1515/** General-use structure for variable-length data  

  • openpgpsdk/trunk/src/Makefile.template

    r240 r241  
    1414 
    1515headers: 
    16         cd ../include && make headers 
     16        cd ../include/openpgpsdk && make headers 
    1717 
    1818libops.a: $(LIBOBJS) 
    …… 
    2727        rm -f libops.a TAGS 
    2828 
    29 .depend: *.[ch] 
    30         $(CC) $(CFLAGS) -E -MM *.c > .depend 
     29.depend: *.[ch] ../include/openpgpsdk/*.h 
     30        $(CC) $(CFLAGS) -E -M *.c > .depend 
    3131 
    3232force_depend: headers 
    33         $(CC) $(CFLAGS) -E -MM *.c > .depend 
     33        $(CC) $(CFLAGS) -E -M *.c > .depend 
    3434 
    3535Makefile: Makefile.template ../configure 

  • openpgpsdk/trunk/src/accumulate.c

    r240 r241  
    22 */ 
    33 
    4 #include "packet.h" 
    5 #include "packet-parse.h" 
    6 #include "util.h" 
    7 #include "openpgpsdk/accumulate.h" 
     4#include <openpgpsdk/packet.h> 
     5#include <openpgpsdk/packet-parse.h> 
     6#include <openpgpsdk/util.h> 
     7#include <openpgpsdk/accumulate.h> 
    88#include "keyring_local.h" 
    9 #include "signature.h" 
     9#include <openpgpsdk/signature.h> 
    1010#include <assert.h> 
    1111#include <stdlib.h> 

  • openpgpsdk/trunk/src/armour.c

    r240 r241  
    1 #include "configure.h" 
     1#include <openpgpsdk/configure.h> 
    22#include <openpgpsdk/armour.h> 
    3 #include "util.h" 
    4 #include "crypto.h" 
     3#include <openpgpsdk/util.h> 
     4#include <openpgpsdk/crypto.h> 
    55 
    66#include <string.h> 

  • openpgpsdk/trunk/src/create.c

    r240 r241  
    22 */ 
    33 
    4 #include "create.h" 
    5 #include "util.h" 
     4#include <openpgpsdk/create.h> 
     5#include <openpgpsdk/util.h> 
    66#include <string.h> 
    77#include <assert.h> 

  • openpgpsdk/trunk/src/fingerprint.c

    r240 r241  
    22 */ 
    33 
    4 #include "packet.h" 
    5 #include "crypto.h" 
    6 #include "memory.h" 
    7 #include "create.h" 
     4#include <openpgpsdk/packet.h> 
     5#include <openpgpsdk/crypto.h> 
     6#include <openpgpsdk/create.h> 
    87#include <assert.h> 
    98#include <string.h> 
    109 
    11 #include "configure.h" 
     10#include <openpgpsdk/configure.h> 
    1211#ifdef HAVE_ALLOCA_H 
    1312# include <alloca.h> 

  • openpgpsdk/trunk/src/hash.c

    r235 r241  
    22 */ 
    33 
    4 #include "crypto.h" 
     4#include <openpgpsdk/crypto.h> 
    55#include <assert.h> 
    66 

  • openpgpsdk/trunk/src/keyring.c

    r237 r241  
    22 */ 
    33 
    4 #include "keyring.h" 
     4#include <openpgpsdk/keyring.h> 
    55#include "keyring_local.h" 
    66#include <stdlib.h> 
    …… 
    5757    { return &data->pkey; } 
    5858 
     59 

  • openpgpsdk/trunk/src/lists.c

    r213 r241  
    55 */ 
    66 
    7 #include "lists.h" 
     7#include <openpgpsdk/lists.h> 
    88 
    99#include <stdlib.h> 

  • openpgpsdk/trunk/src/memory.c

    r240 r241  
    22 */ 
    33 
    4 #include "memory.h" 
    5 #include "create.h" 
     4#include <openpgpsdk/create.h> 
    65#include <stdlib.h> 
    76#include <string.h> 

  • openpgpsdk/trunk/src/openssl_crypto.c

    r237 r241  
    22 */ 
    33 
    4 #include "configure.h" 
    5 #include "crypto.h" 
     4#include <openpgpsdk/configure.h> 
     5#include <openpgpsdk/crypto.h> 
    66#include <openssl/md5.h> 
    77#include <openssl/sha.h> 

  • openpgpsdk/trunk/src/ops_errors.c

    r211 r241  
    22 */ 
    33 
    4 #include "ops_errors.h" 
    5 #include "util.h" 
     4#include <openpgpsdk/errors.h> 
     5#include <openpgpsdk/util.h> 
    66#include <stdlib.h> 
    77 

  • openpgpsdk/trunk/src/packet-parse.c

    r240 r241  
    44 
    55 
    6 #include "packet.h" 
    7 #include "packet-parse.h" 
    8 #include "util.h" 
     6#include <openpgpsdk/packet.h> 
     7#include <openpgpsdk/packet-parse.h> 
     8#include <openpgpsdk/util.h> 
    99#include <openpgpsdk/compress.h> 
    10 #include "lists.h" 
    11 #include "ops_errors.h" 
     10#include <openpgpsdk/errors.h> 
    1211 
    1312#include <assert.h> 

  • openpgpsdk/trunk/src/packet-show.c

    r237 r241  
    55 */ 
    66 
    7 #include "configure.h" 
     7#include <openpgpsdk/configure.h> 
    88 
    99#include <stdlib.h> 
    1010#include <string.h> 
    1111 
    12 #include "packet-show.h" 
    13 #include <util.h> 
     12#include <openpgpsdk/packet-show.h> 
     13#include <openpgpsdk/util.h> 
    1414 
    1515/* 
    …… 
    198198    }; 
    199199 
    200 #include "packet-show-cast.h" 
     200#include <openpgpsdk/packet-show-cast.h> 
    201201 
    202202/* 

  • openpgpsdk/trunk/src/signature.c

    r240 r241  
    22 */ 
    33 
    4 #include "signature.h" 
    5 #include "crypto.h" 
    6 #include "memory.h" 
    7 #include "create.h" 
     4#include <openpgpsdk/signature.h> 
     5#include <openpgpsdk/crypto.h> 
     6#include <openpgpsdk/create.h> 
    87#include <assert.h> 
    98#include <string.h> 

  • openpgpsdk/trunk/src/util.c

    r222 r241  
    22 */ 
    33 
    4 #include "util.h" 
    5 #include "packet-parse.h" 
    6 #include "crypto.h" 
    7 #include "create.h" 
     4#include <openpgpsdk/util.h> 
     5#include <openpgpsdk/packet-parse.h> 
     6#include <openpgpsdk/crypto.h> 
     7#include <openpgpsdk/create.h> 
    88#include <stdio.h> 
    99#include <assert.h> 

  • openpgpsdk/trunk/src/validate.c

    r184 r241  
    1 #include "packet-parse.h" 
    2 #include "keyring.h" 
     1#include <openpgpsdk/packet-parse.h> 
     2#include <openpgpsdk/keyring.h> 
    33#include "keyring_local.h" 
    4 #include "util.h" 
    5 #include "signature.h" 
     4#include <openpgpsdk/util.h> 
     5#include <openpgpsdk/signature.h> 
    66#include <assert.h> 
    77#include <string.h>