fixup headers, makefile

joncampbell123 · Nov 26, 2016 · 9a2f006 · 9a2f006
1 parent 7d33fb4
commit 9a2f006
Show file tree

Hide file tree

Showing 20 changed files with 76 additions and 112 deletions.
diff --git a/fmt/omf/makefile b/fmt/omf/makefile
@@ -4,57 +4,21 @@ all: linux-host linux-host/omfdump
 linux-host:
 	mkdir -p linux-host
 
-linux-host/omfdump: linux-host/omfcstr.o linux-host/omfctx.o linux-host/omfrec.o linux-host/omfrecs.o linux-host/olnames.o linux-host/osegdefs.o linux-host/osegdeft.o linux-host/ogrpdefs.o linux-host/oextdefs.o linux-host/oextdeft.o linux-host/opubdefs.o linux-host/opubdeft.o linux-host/omledata.o linux-host/ofixupps.o linux-host/ofixuppt.o linux-host/omfdump.o
-	gcc -o $@ $^
-
-linux-host/omfctx.o: omfctx.c
-	gcc -DLINUX -Wall -Wextra -pedantic -std=gnu99 -c -o $@ $<
-
-linux-host/omfrec.o: omfrec.c
-	gcc -DLINUX -Wall -Wextra -pedantic -std=gnu99 -c -o $@ $<
-
-linux-host/omfrecs.o: omfrecs.c
-	gcc -DLINUX -Wall -Wextra -pedantic -std=gnu99 -c -o $@ $<
-
-linux-host/omfcstr.o: omfcstr.c
-	gcc -DLINUX -Wall -Wextra -pedantic -std=gnu99 -c -o $@ $<
-
-linux-host/omfdump.o: omfdump.c
-	gcc -DLINUX -Wall -Wextra -pedantic -std=gnu99 -c -o $@ $<
-
-linux-host/olnames.o: olnames.c
-	gcc -DLINUX -Wall -Wextra -pedantic -std=gnu99 -c -o $@ $<
+OMFDUMP = linux-host/omfdump
 
-linux-host/osegdefs.o: osegdefs.c
-	gcc -DLINUX -Wall -Wextra -pedantic -std=gnu99 -c -o $@ $<
+OMFLIB = linux-host/omf.a
+OMFLIB_DEPS = linux-host/omfcstr.o linux-host/omfctx.o linux-host/omfrec.o linux-host/omfrecs.o linux-host/olnames.o linux-host/osegdefs.o linux-host/osegdeft.o linux-host/ogrpdefs.o linux-host/oextdefs.o linux-host/oextdeft.o linux-host/opubdefs.o linux-host/opubdeft.o linux-host/omledata.o linux-host/ofixupps.o linux-host/ofixuppt.o
 
-linux-host/osegdeft.o: osegdeft.c
-	gcc -DLINUX -Wall -Wextra -pedantic -std=gnu99 -c -o $@ $<
-
-linux-host/oextdefs.o: oextdefs.c
-	gcc -DLINUX -Wall -Wextra -pedantic -std=gnu99 -c -o $@ $<
-
-linux-host/oextdeft.o: oextdeft.c
-	gcc -DLINUX -Wall -Wextra -pedantic -std=gnu99 -c -o $@ $<
-
-linux-host/ogrpdefs.o: ogrpdefs.c
-	gcc -DLINUX -Wall -Wextra -pedantic -std=gnu99 -c -o $@ $<
-
-linux-host/opubdefs.o: opubdefs.c
-	gcc -DLINUX -Wall -Wextra -pedantic -std=gnu99 -c -o $@ $<
-
-linux-host/opubdeft.o: opubdeft.c
-	gcc -DLINUX -Wall -Wextra -pedantic -std=gnu99 -c -o $@ $<
-
-linux-host/ofixupps.o: ofixupps.c
-	gcc -DLINUX -Wall -Wextra -pedantic -std=gnu99 -c -o $@ $<
+$(OMFDUMP): linux-host/omfdump.o $(OMFLIB)
+	gcc -o $@ $^
 
-linux-host/ofixuppt.o: ofixuppt.c
-	gcc -DLINUX -Wall -Wextra -pedantic -std=gnu99 -c -o $@ $<
+$(OMFLIB): $(OMFLIB_DEPS)
+	rm -f $(OMFLIB)
+	ar r $(OMFLIB) $(OMFLIB_DEPS)
 
-linux-host/omledata.o: omledata.c
-	gcc -DLINUX -Wall -Wextra -pedantic -std=gnu99 -c -o $@ $<
+linux-host/%.o : %.c
+	gcc -I../.. -DLINUX -Wall -Wextra -pedantic -std=gnu99 -c -o $@ $^
 
 clean:
-	rm -f linux-host/omfdump linux-host/*.o
+	rm -f linux-host/omfdump linux-host/*.o linux-host/*.a
 
diff --git a/fmt/omf/oextdefs.c b/fmt/omf/oextdefs.c
@@ -1,6 +1,6 @@
 
-#include "omfcstr.h"
-#include "oextdefs.h"
+#include <fmt/omf/omfcstr.h>
+#include <fmt/omf/oextdefs.h>
 
 void omf_extdefs_context_init_extdef(struct omf_extdef_t * const ctx) {
     ctx->type = OMF_EXTDEF_TYPE_LOCAL;

diff --git a/fmt/omf/oextdeft.c b/fmt/omf/oextdeft.c
@@ -1,5 +1,5 @@
 
-#include "oextdefs.h"
+#include <fmt/omf/oextdefs.h>
 
 const char *omf_extdef_type_to_string(const unsigned char t) {
     switch (t) {

diff --git a/fmt/omf/ofixupps.c b/fmt/omf/ofixupps.c
@@ -1,5 +1,5 @@
 
-#include "ofixupps.h"
+#include <fmt/omf/ofixupps.h>
 
 void omf_fixupps_clear_thread(struct omf_fixupp_thread_t * const th) {
     th->method = 0;

diff --git a/fmt/omf/ofixuppt.c b/fmt/omf/ofixuppt.c
@@ -1,6 +1,6 @@
 
-#include "ofixupps.h"
-#include "ofixuppt.h"
+#include <fmt/omf/ofixupps.h>
+#include <fmt/omf/ofixuppt.h>
 
 const char *omf_fixupp_location_to_str(const unsigned char loc) {
     switch (loc) {

diff --git a/fmt/omf/ogrpdefs.c b/fmt/omf/ogrpdefs.c
@@ -1,5 +1,5 @@
 
-#include "ogrpdefs.h"
+#include <fmt/omf/ogrpdefs.h>
 
 void omf_grpdefs_context_init(struct omf_grpdefs_context_t * const ctx) {
     ctx->segdefs = NULL;

diff --git a/fmt/omf/olnames.c b/fmt/omf/olnames.c
@@ -1,6 +1,6 @@
 
-#include "omfcstr.h"
-#include "olnames.h"
+#include <fmt/omf/omfcstr.h>
+#include <fmt/omf/olnames.h>
 
 void omf_lnames_context_init(struct omf_lnames_context_t * const ctx) {
     ctx->omf_LNAMES = NULL;

diff --git a/fmt/omf/olnames.h b/fmt/omf/olnames.h
@@ -2,7 +2,7 @@
 #ifndef _DOSLIB_OMF_OLNAMES_H
 #define _DOSLIB_OMF_OLNAMES_H
 
-#include "omfrec.h"
+#include <fmt/omf/omfrec.h>
 
 /* LNAMES collection */
 struct omf_lnames_context_t {

diff --git a/fmt/omf/omfcstr.c b/fmt/omf/omfcstr.c
@@ -1,5 +1,5 @@
 
-#include "omfcstr.h"
+#include <fmt/omf/omfcstr.h>
 
 void cstr_free(char ** const p) {
     if (*p != NULL) {

diff --git a/fmt/omf/omfctx.c b/fmt/omf/omfctx.c
@@ -10,21 +10,21 @@
 #include <fcntl.h>
 #include <stdio.h>
 
-#include "omfrecs.h"
-#include "omfcstr.h"
-#include "omfrec.h"
-#include "olnames.h"
-#include "osegdefs.h"
-#include "osegdeft.h"
-#include "ogrpdefs.h"
-#include "oextdefs.h"
-#include "oextdeft.h"
-#include "opubdefs.h"
-#include "opubdeft.h"
-#include "omledata.h"
-#include "ofixupps.h"
-#include "ofixuppt.h"
-#include "omfctx.h"
+#include <fmt/omf/omfrecs.h>
+#include <fmt/omf/omfcstr.h>
+#include <fmt/omf/omfrec.h>
+#include <fmt/omf/olnames.h>
+#include <fmt/omf/osegdefs.h>
+#include <fmt/omf/osegdeft.h>
+#include <fmt/omf/ogrpdefs.h>
+#include <fmt/omf/oextdefs.h>
+#include <fmt/omf/oextdeft.h>
+#include <fmt/omf/opubdefs.h>
+#include <fmt/omf/opubdeft.h>
+#include <fmt/omf/omledata.h>
+#include <fmt/omf/ofixupps.h>
+#include <fmt/omf/ofixuppt.h>
+#include <fmt/omf/omfctx.h>
 
 char                                    omf_temp_str[255+1/*NUL*/];
 

diff --git a/fmt/omf/omfctx.h b/fmt/omf/omfctx.h
@@ -10,20 +10,20 @@
 #include <fcntl.h>
 #include <stdio.h>
 
-#include "omfrecs.h"
-#include "omfcstr.h"
-#include "omfrec.h"
-#include "olnames.h"
-#include "osegdefs.h"
-#include "osegdeft.h"
-#include "ogrpdefs.h"
-#include "oextdefs.h"
-#include "oextdeft.h"
-#include "opubdefs.h"
-#include "opubdeft.h"
-#include "omledata.h"
-#include "ofixupps.h"
-#include "ofixuppt.h"
+#include <fmt/omf/omfrecs.h>
+#include <fmt/omf/omfcstr.h>
+#include <fmt/omf/omfrec.h>
+#include <fmt/omf/olnames.h>
+#include <fmt/omf/osegdefs.h>
+#include <fmt/omf/osegdeft.h>
+#include <fmt/omf/ogrpdefs.h>
+#include <fmt/omf/oextdefs.h>
+#include <fmt/omf/oextdeft.h>
+#include <fmt/omf/opubdefs.h>
+#include <fmt/omf/opubdeft.h>
+#include <fmt/omf/omledata.h>
+#include <fmt/omf/ofixupps.h>
+#include <fmt/omf/ofixuppt.h>
 
 extern char                             omf_temp_str[255+1/*NUL*/];
 

diff --git a/fmt/omf/omfdump.c b/fmt/omf/omfdump.c
@@ -12,21 +12,21 @@
 #include <fcntl.h>
 #include <stdio.h>
 
-#include "omfrecs.h"
-#include "omfcstr.h"
-#include "omfrec.h"
-#include "olnames.h"
-#include "osegdefs.h"
-#include "osegdeft.h"
-#include "ogrpdefs.h"
-#include "oextdefs.h"
-#include "oextdeft.h"
-#include "opubdefs.h"
-#include "opubdeft.h"
-#include "omledata.h"
-#include "ofixupps.h"
-#include "ofixuppt.h"
-#include "omfctx.h"
+#include <fmt/omf/omfrecs.h>
+#include <fmt/omf/omfcstr.h>
+#include <fmt/omf/omfrec.h>
+#include <fmt/omf/olnames.h>
+#include <fmt/omf/osegdefs.h>
+#include <fmt/omf/osegdeft.h>
+#include <fmt/omf/ogrpdefs.h>
+#include <fmt/omf/oextdefs.h>
+#include <fmt/omf/oextdeft.h>
+#include <fmt/omf/opubdefs.h>
+#include <fmt/omf/opubdeft.h>
+#include <fmt/omf/omledata.h>
+#include <fmt/omf/ofixupps.h>
+#include <fmt/omf/ofixuppt.h>
+#include <fmt/omf/omfctx.h>
 
 #ifndef O_BINARY
 #define O_BINARY (0)

diff --git a/fmt/omf/omfrec.c b/fmt/omf/omfrec.c
@@ -1,5 +1,5 @@
 
-#include "omfrec.h"
+#include <fmt/omf/omfrec.h>
 
 unsigned char omf_record_is_modend(const struct omf_record_t * const rec) {
     return ((rec->rectype&0xFE) == 0x8A); // MODEND 0x8A or 0x8B

diff --git a/fmt/omf/omledata.c b/fmt/omf/omledata.c
@@ -1,5 +1,5 @@
 
-#include "omledata.h"
+#include <fmt/omf/omledata.h>
 
 int omf_ledata_parse_header(struct omf_ledata_info_t * const info,struct omf_record_t * const rec) {
     info->data = NULL;

diff --git a/fmt/omf/omledata.h b/fmt/omf/omledata.h
@@ -2,7 +2,7 @@
 #ifndef _DOSLIB_OMF_OMLEDATA_H
 #define _DOSLIB_OMF_OMLEDATA_H
 
-#include "omfrec.h"
+#include <fmt/omf/omfrec.h>
 
 // this is filled in by a utility function after reading the OMF record from the beginning.
 // the data pointer is valid UNTIL the OMF record is overwritten/rewritten, so take the

diff --git a/fmt/omf/opubdefs.c b/fmt/omf/opubdefs.c
@@ -1,6 +1,6 @@
 
-#include "omfcstr.h"
-#include "opubdefs.h"
+#include <fmt/omf/omfcstr.h>
+#include <fmt/omf/opubdefs.h>
 
 void omf_pubdefs_context_init_pubdef(struct omf_pubdef_t * const ctx) {
     ctx->group_index = 0;

diff --git a/fmt/omf/opubdeft.c b/fmt/omf/opubdeft.c
@@ -1,5 +1,5 @@
 
-#include "opubdefs.h"
+#include <fmt/omf/opubdefs.h>
 
 const char *omf_pubdef_type_to_string(const unsigned char t) {
     switch (t) {

diff --git a/fmt/omf/osegdefs.c b/fmt/omf/osegdefs.c
@@ -1,5 +1,5 @@
 
-#include "osegdefs.h"
+#include <fmt/omf/osegdefs.h>
 
 void omf_segdefs_context_init_segdef(struct omf_segdef_t *s) {
     memset(s,0,sizeof(*s));

diff --git a/fmt/omf/osegdefs.h b/fmt/omf/osegdefs.h
@@ -12,7 +12,7 @@
 #include <fcntl.h>
 #include <stdio.h>
 
-#include "omfrec.h"
+#include <fmt/omf/omfrec.h>
 
 enum {
     OMF_SEGDEF_ALIGN_ABSOLUTE=0,

diff --git a/fmt/omf/osegdeft.c b/fmt/omf/osegdeft.c
@@ -1,6 +1,6 @@
 
-#include "osegdefs.h"
-#include "osegdeft.h"
+#include <fmt/omf/osegdefs.h>
+#include <fmt/omf/osegdeft.h>
 
 const char *omf_segdefs_alignment_to_str(const unsigned char a) {
     switch (a) {