Rearrange the libc config files, ready for adding new options.

lang/cem/libcc.ansi/headers/ack/config.h

@@ -1,6 +1,6 @@
 #ifndef _ACK_CONFIG_H
 #define _ACK_CONFIG_H
 
-#define ACKCONF_TIME_IS_A_SYSCALL
+#include <ack/plat.h>
 
 #endif

lang/cem/libcc.ansi/headers/build.lua

@@ -13,6 +13,7 @@ end
 
 addheader("", filenamesof("./*.h"))
 addheader("sys/", filenamesof("./sys/*.h"))
+addheader("ack/", filenamesof("./ack/*.h"))
 
 acklibrary {
 	name = "headers",

plat/cpm/include/ack/plat.h

@@ -3,8 +3,8 @@
  * $Revision$
  */
 
-#ifndef _ACK_CONFIG_H
-#define _ACK_CONFIG_H
+#ifndef _ACK_PLAT_H
+#define _ACK_PLAT_H
 
 /* We're providing a time() system call rather than wanting a wrapper around
  * gettimeofday() in the libc. */

plat/cpm/include/build.lua

@@ -8,7 +8,7 @@ local function addheader(h)
 	packagemap["$(PLATIND)/cpm/include/"..h] = "./"..h
 end
 
-addheader("ack/config.h")
+addheader("ack/plat.h")
 addheader("cpm.h")
 addheader("unistd.h")
 

plat/em22/include/ack/plat.h

@@ -0,0 +1,6 @@
+#ifndef _ACK_PLAT_H
+#define _ACK_PLAT_H
+
+#define ACKCONF_TIME_IS_A_SYSCALL
+
+#endif

plat/em22/include/build.lua

@@ -8,7 +8,7 @@ local function addheader(h)
 	packagemap["$(PLATIND)/em22/include/"..h] = "./"..h
 end
 
-addheader("ack/config.h")
+addheader("ack/plat.h")
 addheader("sys/types.h")
 addheader("sys/timeb.h")
 addheader("unistd.h")

plat/linux386/include/ack/plat.h

@@ -3,8 +3,8 @@
  * $Revision$
  */
 
-#ifndef _ACK_CONFIG_H
-#define _ACK_CONFIG_H
+#ifndef _ACK_PLAT_H
+#define _ACK_PLAT_H
 
 /* We're providing a time() system call rather than wanting a wrapper around
  * gettimeofday() in the libc. */

plat/linux386/include/build.lua

@@ -8,7 +8,7 @@ local function addheader(h)
 	packagemap["$(PLATIND)/linux386/include/"..h] = "./"..h
 end
 
-addheader("ack/config.h")
+addheader("ack/plat.h")
 addheader("sys/ioctl.h")
 addheader("unistd.h")
 

plat/linux68k/include/ack/plat.h

@@ -3,8 +3,8 @@
  * $Revision: 1.1 $
  */
 
-#ifndef _ACK_CONFIG_H
-#define _ACK_CONFIG_H
+#ifndef _ACK_PLAT_H
+#define _ACK_PLAT_H
 
 /* We're providing a time() system call rather than wanting a wrapper around
  * gettimeofday() in the libc. */

plat/linux68k/include/build.lua

@@ -8,7 +8,7 @@ local function addheader(h)
 	packagemap["$(PLATIND)/linux68k/include/"..h] = "./"..h
 end
 
-addheader("ack/config.h")
+addheader("ack/plat.h")
 addheader("sys/ioctl.h")
 addheader("unistd.h")
 

plat/linuxppc/include/ack/plat.h

@@ -3,8 +3,8 @@
  * $Revision: 1.1 $
  */
 
-#ifndef _ACK_CONFIG_H
-#define _ACK_CONFIG_H
+#ifndef _ACK_PLAT_H
+#define _ACK_PLAT_H
 
 /* We're providing a time() system call rather than wanting a wrapper around
  * gettimeofday() in the libc. */

plat/linuxppc/include/build.lua

@@ -8,7 +8,7 @@ local function addheader(h)
 	packagemap["$(PLATIND)/linuxppc/include/"..h] = "./"..h
 end
 
-addheader("ack/config.h")
+addheader("ack/plat.h")
 addheader("sys/ioctl.h")
 addheader("unistd.h")
 

plat/osx/include/ack/plat.h

@@ -3,8 +3,8 @@
  * $Revision$
  */
 
-#ifndef _ACK_CONFIG_H
-#define _ACK_CONFIG_H
+#ifndef _ACK_PLAT_H
+#define _ACK_PLAT_H
 
 /* We're providing a time() system call rather than wanting a wrapper around
  * gettimeofday() in the libc. */

plat/osx/include/build.lua

@@ -8,7 +8,7 @@ local function addheader(h)
 	packagemap["$(PLATIND)/osx/include/"..h] = "plat/osx/include/"..h
 end
 
-addheader("ack/config.h")
+addheader("ack/plat.h")
 addheader("sys/dirent.h")
 addheader("sys/mman.h")
 addheader("sys/stat.h")

plat/pc86/include/ack/plat.h

@@ -3,8 +3,8 @@
  * $Revision$
  */
 
-#ifndef _ACK_CONFIG_H
-#define _ACK_CONFIG_H
+#ifndef _ACK_PLAT_H
+#define _ACK_PLAT_H
 
 /* We're providing a time() system call rather than wanting a wrapper around
  * gettimeofday() in the libc. */

plat/pc86/include/build.lua

@@ -8,7 +8,7 @@ local function addheader(h)
 	packagemap["$(PLATIND)/pc86/include/"..h] = "./"..h
 end
 
-addheader("ack/config.h")
+addheader("ack/plat.h")
 addheader("unistd.h")
 
 acklibrary {

plat/pdpv7/include/ack/plat.h

@@ -5,8 +5,8 @@
  * See the file 'Copying' in the root of the distribution for the full text.
  */
 
-#ifndef _ACK_CONFIG_H
-#define _ACK_CONFIG_H
+#ifndef _ACK_PLAT_H
+#define _ACK_PLAT_H
 
 /* We're providing a time() system call rather than wanting a wrapper around
  * gettimeofday() in the libc. */

plat/pdpv7/include/build.lua

@@ -8,7 +8,7 @@ local function addheader(h)
 	packagemap["$(PLATIND)/pdpv7/include/"..h] = "./"..h
 end
 
-addheader("ack/config.h")
+addheader("ack/plat.h")
 addheader("sys/select.h")
 addheader("termios.h")
 addheader("unistd.h")

plat/qemuppc/include/ack/plat.h

@@ -3,8 +3,8 @@
  * $Revision: 1.1 $
  */
 
-#ifndef _ACK_CONFIG_H
-#define _ACK_CONFIG_H
+#ifndef _ACK_PLAT_H
+#define _ACK_PLAT_H
 
 /* We're providing a time() system call rather than wanting a wrapper around
  * gettimeofday() in the libc. */

plat/qemuppc/include/build.lua

@@ -8,7 +8,7 @@ local function addheader(h)
 	packagemap["$(PLATIND)/qemuppc/include/"..h] = "./"..h
 end
 
-addheader("ack/config.h")
+addheader("ack/plat.h")
 addheader("sys/ioctl.h")
 addheader("unistd.h")
 

plat/rpi/include/ack/plat.h

@@ -5,8 +5,8 @@
  * See the file 'Copying' in the root of the distribution for the full text.
  */
 
-#ifndef _ACK_CONFIG_H
-#define _ACK_CONFIG_H
+#ifndef _ACK_PLAT_H
+#define _ACK_PLAT_H
 
 /* We're providing a time() system call rather than wanting a wrapper around
  * gettimeofday() in the libc. */

plat/rpi/include/build.lua

@@ -8,7 +8,7 @@ local function addheader(h)
 	packagemap["$(PLATIND)/rpi/include/"..h] = "./"..h
 end
 
-addheader("ack/config.h")
+addheader("ack/plat.h")
 addheader("pi.h")
 addheader("sys/select.h")
 addheader("termios.h")