Index: Makefile
===================================================================
RCS file: /cvsroot/src/lib/Makefile,v
retrieving revision 1.207
diff -p -r1.207 Makefile
*** Makefile	11 Sep 2013 23:04:10 -0000	1.207
--- Makefile	3 Oct 2013 19:38:22 -0000
*************** SUBDIR+=	librumpclient
*** 56,66 ****
  SUBDIR+=	libskey
  .endif
  
- .if (${MKCRYPTO} != "no")
- SUBDIR+=	../crypto/external/bsd/netpgp/libmj
- SUBDIR+=	../crypto/external/bsd/netpgp/lib/verify
- .endif
- 
  .if (${MKMDNS} != "no")
  SUBDIR+=	../external/apache2/mDNSResponder/lib
  .endif
--- 56,61 ----
*************** SUBDIR+=	../external/bsd/libelf/lib
*** 73,79 ****
  SUBDIR+=	../external/bsd/liblzf/lib
  SUBDIR+=	../external/bsd/libpcap/lib
  
- SUBDIR+=	../external/mit/lua/lib
  SUBDIR+=	../external/mit/expat/lib
  
  SUBDIR+=	../external/public-domain/sqlite/lib
--- 68,73 ----
*************** SUBDIR+=	../external/lgpl2/mpc/lib/libmp
*** 104,110 ****
--- 98,110 ----
  #==================== 1st library dependency barrier ====================
  SUBDIR+=	.WAIT
  
+ .if (${MKCRYPTO} != "no")
+ SUBDIR+=	../crypto/external/bsd/netpgp/libmj
+ SUBDIR+=	../crypto/external/bsd/netpgp/lib/verify # depends on libz
+ .endif
+ 
  SUBDIR+=	../external/bsd/libdwarf/lib # depends on libelf
+ SUBDIR+=	../external/mit/lua/lib # depends on libm
  SUBDIR+=	libcurses	# depends on libterminfo
  SUBDIR+=	libdm		# depends on libprop
  SUBDIR+=	libedit		# depends on libterminfo
*************** SUBDIR+=	librumphijack	# depends on libr
*** 121,127 ****
  
  .if (${MKNPF} != "no")
  SUBDIR+=	libnpf		# depends on libprop
- SUBDIR+=	npf
  .endif
  
  .if (${MKCRYPTO} != "no")
--- 121,126 ----
*************** SUBDIR+=	../external/gpl3/gcc/lib/libsup
*** 161,166 ****
--- 160,169 ----
  #==================== 2nd library dependency barrier ====================
  SUBDIR+=	.WAIT
  
+ .if (${MKNPF} != "no")
+ SUBDIR+=	npf		# depends on libnpf
+ .endif
+ 
  .if (${MKATF} != "no")
  SUBDIR+=	../external/bsd/atf/lib		# depends on libstdc++
  .endif