ref: 618082bcabf83cbf1c46cdcf879b98fbd3f0fed9
parent: cd779b951147c9b3c37e4d8201f736e8fba397ce
author: Vegard Nossum <[email protected]>
date: Thu Jun 11 05:18:21 EDT 2009
lib: move includes to include/lib/ Signed-off-by: Vegard Nossum <[email protected]>
--- /dev/null
+++ b/include/lib/library.h
@@ -1,0 +1,13 @@
+#ifndef ASMOTOR_LIB_LIBRARY_H
+#define ASMOTOR_LIB_LIBRARY_H
+
+#include "lib/libwrap.h"
+
+extern sLibrary *lib_Read(char *filename);
+extern BBOOL lib_Write(sLibrary * lib, char *filename);
+extern sLibrary *lib_AddReplace(sLibrary * lib, char *filename);
+extern void lib_Free(sLibrary * lib);
+extern sLibrary *lib_DeleteModule(sLibrary * lib, char *filename);
+extern sLibrary *lib_Find(sLibrary * lib, char *filename);
+
+#endif
--- /dev/null
+++ b/include/lib/libwrap.h
@@ -1,0 +1,19 @@
+#ifndef ASMOTOR_LIB_LIBWRAP_H
+#define ASMOTOR_LIB_LIBWRAP_H
+
+#include "lib/types.h"
+
+#define MAXNAMELENGTH 256
+
+struct LibraryWrapper {+ char tName[MAXNAMELENGTH];
+ UWORD uwTime;
+ UWORD uwDate;
+ SLONG nByteLength;
+ UBYTE *pData;
+ struct LibraryWrapper *pNext;
+};
+
+typedef struct LibraryWrapper sLibrary;
+
+#endif
--- /dev/null
+++ b/include/lib/types.h
@@ -1,0 +1,16 @@
+#ifndef ASMOTOR_LIB_TYPES_H
+#define ASMOTOR_LIB_TYPES_H
+
+#if defined(AMIGA) || defined(__GNUC__)
+#define _MAX_PATH 512
+#endif
+
+typedef unsigned char UBYTE;
+typedef signed char SBYTE;
+typedef unsigned short UWORD;
+typedef signed short SWORD;
+typedef unsigned long ULONG;
+typedef signed long SLONG;
+typedef signed char BBOOL;
+
+#endif
--- a/src/lib/Makefile
+++ b/src/lib/Makefile
@@ -9,4 +9,4 @@
gcc -Wall -o $@ $^
.c.o:
- gcc -Wall -I. -I.. -Iinclude -g -c -o $@ $<
+ gcc -Wall -I. -I.. -I../../include -g -c -o $@ $<
--- a/src/lib/include/library.h
+++ /dev/null
@@ -1,13 +1,0 @@
-#ifndef LIBRARY_H
-#define LIBRARY_H
-
-#include "libwrap.h"
-
-extern sLibrary *lib_Read(char *filename);
-extern BBOOL lib_Write(sLibrary * lib, char *filename);
-extern sLibrary *lib_AddReplace(sLibrary * lib, char *filename);
-extern void lib_Free(sLibrary * lib);
-extern sLibrary *lib_DeleteModule(sLibrary * lib, char *filename);
-extern sLibrary *lib_Find(sLibrary * lib, char *filename);
-
-#endif
--- a/src/lib/include/libwrap.h
+++ /dev/null
@@ -1,19 +1,0 @@
-#ifndef LIBWRAP_H
-#define LIBWRAP_H
-
-#include "types.h"
-
-#define MAXNAMELENGTH 256
-
-struct LibraryWrapper {- char tName[MAXNAMELENGTH];
- UWORD uwTime;
- UWORD uwDate;
- SLONG nByteLength;
- UBYTE *pData;
- struct LibraryWrapper *pNext;
-};
-
-typedef struct LibraryWrapper sLibrary;
-
-#endif
--- a/src/lib/include/types.h
+++ /dev/null
@@ -1,16 +1,0 @@
-#ifndef TYPES_H
-#define TYPES_H 1
-
-#if defined(AMIGA) || defined(__GNUC__)
-#define _MAX_PATH 512
-#endif
-
-typedef unsigned char UBYTE;
-typedef signed char SBYTE;
-typedef unsigned short UWORD;
-typedef signed short SWORD;
-typedef unsigned long ULONG;
-typedef signed long SLONG;
-typedef signed char BBOOL;
-
-#endif
--- a/src/lib/library.c
+++ b/src/lib/library.c
@@ -1,8 +1,9 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include "types.h"
-#include "libwrap.h"
+
+#include "lib/types.h"
+#include "lib/libwrap.h"
extern void fatalerror(char *s);
--- a/src/lib/main.c
+++ b/src/lib/main.c
@@ -4,8 +4,9 @@
#include <ctype.h>
#include "asmotor.h"
-#include "types.h"
-#include "library.h"
+
+#include "lib/types.h"
+#include "lib/library.h"
// Quick and dirty...but it works
#ifdef __GNUC__