Fixed up a few build errors, still keeps telling me it can't find

posixninja · posixninja · commit 01a2d3ebbe9c · 2014-12-12T15:53:41.000-05:00
libhfsplus-1.0, but I should fix that soon
diff --git a/AUTHORS b/AUTHORS
@@ -0,0 +1,2 @@
+Joshua Hill
+Nicolas Haunold
diff --git a/ChangeLog b/ChangeLog
@@ -0,0 +1 @@
+July 17 2013) Switch my copyright over to new team name
diff --git a/configure.ac b/configure.ac
@@ -24,7 +24,7 @@ AC_PROG_LIBTOOL
 
 PKG_CHECK_MODULES(plist, libplist >= 1.0)
 PKG_CHECK_MODULES(crippy, libcrippy-1.0 >= 1.0)
-PKG_CHECK_MODULES(hfsplus, libhfsplus-1.0 >= 2.0)
+PKG_CHECK_MODULES(hfsplus, libhfsplus-1.0 >= 1.0)
 
 AC_CONFIG_FILES(Makefile tools/Makefile src/Makefile include/Makefile libdmg-1.0.pc)
 AC_OUTPUT
diff --git a/include/libdmg-1.0/abstractfile.h b/include/libdmg-1.0/abstractfile.h
@@ -1,7 +1,7 @@
 #ifndef ABSTRACTFILE_H
 #define ABSTRACTFILE_H
 
-#include "common.h"
+#include <libdmg-1.0/common.h>
 #include <stdint.h>
 
 typedef struct AbstractFile AbstractFile;
diff --git a/include/libdmg-1.0/dmg.h b/include/libdmg-1.0/dmg.h
@@ -5,8 +5,8 @@
 #include <stdint.h>
 #include <stdio.h>
 
-#include <hfs/hfsplus.h>
-#include "abstractfile.h"
+#include <libhfsplus-1.0/hfsplus.h>
+#include <libdmg-1.0/abstractfile.h>
 
 #define CHECKSUM_CRC32 0x00000002
 #define CHECKSUM_MKBLOCK 0x0002
diff --git a/include/libdmg-1.0/dmgfile.h b/include/libdmg-1.0/dmgfile.h
@@ -4,7 +4,7 @@
  *
  */
 
-#include <dmg/dmg.h>
+#include <libdmg-1.0/dmg.h>
 
 io_func* openDmgFile(AbstractFile* dmg);
 io_func* openDmgFilePartition(AbstractFile* dmg, int partition);
diff --git a/include/libdmg-1.0/dmglib.h b/include/libdmg-1.0/dmglib.h
@@ -1,8 +1,8 @@
 #ifndef DMGLIB_H
 #define DMGLIB_H
 
-#include <dmg/dmg.h>
-#include "abstractfile.h"
+#include <libdmg-1.0/dmg.h>
+#include <libdmg-1.0/abstractfile.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/libdmg-1.0/filevault.h b/include/libdmg-1.0/filevault.h
@@ -2,7 +2,7 @@
 #define FILEVAULT_H
 
 #include <stdint.h>
-#include "dmg.h"
+#include <libdmg-1.0/dmg.h>
 
 #ifdef HAVE_CRYPT
 
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -7,7 +7,7 @@ AM_LDFLAGS = $(libcrippy_LIBS) \
 			$(libhfsplus_LIBS) \
 			$(libplist_LIBS)
 
-libdmg_LTLIBRARIES = libdmg-1.0.la
+lib_LTLIBRARIES = libdmg-1.0.la
 
 libdmg_1_0_la_SOURCES = libdmg.c \
 						abstractfile.c \

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+July 17 2013) Switch my copyright over to new team name`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`*`
`5`	`5`	`*/`
`6`	`6`
`7`		`-#include <dmg/dmg.h>`
	`7`	`+#include <libdmg-1.0/dmg.h>`
`8`	`8`
`9`	`9`	`io_func* openDmgFile(AbstractFile* dmg);`
`10`	`10`	`io_func* openDmgFilePartition(AbstractFile* dmg, int partition);`