rename cgpt files with cgptlib prefix (to avoid conflicts to cgpt utility)

Review URL: http://codereview.chromium.org/2082007

Makefile

@@ -8,9 +8,10 @@ export TOP = $(shell pwd)
 export INCLUDES = \
 	-I$(TOP)/common/include \
 	-I$(TOP)/cryptolib/include \
-	-I$(TOP)/misclibs/include
+	-I$(TOP)/misclibs/include \
+	-I$(TOP)/cgptlib
 
-SUBDIRS=common cryptolib misclibs vfirmware vkernel utility tests
+SUBDIRS=common cgptlib cryptolib misclibs vfirmware vkernel utility tests
 
 all:
 	for i in $(SUBDIRS); do \

cgptlib/Makefile

@@ -2,8 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-CFLAGS ?= -Wall -Werror -ansi
-INCLUDES += tests
+CFLAGS += -Wall -Werror -ansi
+INCLUDES += -Itests
 SUBDIRS = tests
 
 all: cgpt.a
@@ -14,11 +14,11 @@ all: cgpt.a
 .c.o:
 	$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
 
-cgpt.a: cgpt.o
-	$(AR) rs cgpt.a $<
+cgpt.a: cgptlib.o quick_sort.o crc32.o
+	$(AR) rs $@ $^
 
 clean:
 	for i in $(SUBDIRS); do \
 	( $(MAKE) -C $$i clean ) ; \
 	done
-	rm -f cgpt cgpt-host *.o *~ *.a
+	rm -f *.o *~ *.a

cgptlib/cgptlib.c

@@ -3,9 +3,9 @@
  * found in the LICENSE file.
  */
 
-#include "cgpt.h"
+#include "cgptlib.h"
 #include <string.h>
-#include "cgpt_internal.h"
+#include "cgptlib_internal.h"
 #include "crc32.h"
 #include "gpt.h"
 #include "quick_sort.h"

cgptlib/cgptlib.h

@@ -3,8 +3,8 @@
  * found in the LICENSE file.
  */
 
-#ifndef VBOOT_REFERENCE_CGPT_H_
-#define VBOOT_REFERENCE_CGPT_H_
+#ifndef VBOOT_REFERENCE_CGPTLIB_H_
+#define VBOOT_REFERENCE_CGPTLIB_H_
 
 #include "gpt.h"
 #include <stdint.h>
@@ -133,4 +133,4 @@ int GptUpdateKernelEntry(GptData *gpt, uint32_t update_type);
  *   GPT_ERROR_INVALID_UPDATE_TYPE, invalid 'update_type' is given.
  */
 
-#endif  /* VBOOT_REFERENCE_CGPT_H_ */
+#endif  /* VBOOT_REFERENCE_CGPTLIB_H_ */

cgptlib/cgptlib_internal.h

@@ -3,11 +3,11 @@
  * found in the LICENSE file.
  */
 
-#ifndef VBOOT_REFERENCE_CGPT_INTERNAL_H_
-#define VBOOT_REFERENCE_CGPT_INTERNAL_H_
+#ifndef VBOOT_REFERENCE_CGPTLIB_INTERNAL_H_
+#define VBOOT_REFERENCE_CGPTLIB_INTERNAL_H_
 
 #include <stdint.h>
-#include "cgpt.h"
+#include "cgptlib.h"
 
 int CheckParameters(GptData *gpt);
 uint32_t CheckHeaderSignature(GptData *gpt);
@@ -79,4 +79,4 @@ int GetSuccess(GptData *gpt, int secondary, int entry_index);
 #define CGPT_ATTRIBUTE_PRIORITY_MASK (CGPT_ATTRIBUTE_MAX_PRIORITY << \
                                       CGPT_ATTRIBUTE_PRIORITY_OFFSET)
 
-#endif /* VBOOT_REFERENCE_CGPT_INTERNAL_H_ */
+#endif /* VBOOT_REFERENCE_CGPTLIB_INTERNAL_H_ */

cgptlib/tests/Makefile

@@ -2,11 +2,10 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-CC ?= cc
-CFLAGS ?= -Wall -DNDEBUG -Werror -ansi
+CFLAGS += -Wall -DNDEBUG -Werror -ansi
 LIBS = ../cgpt.a ../../common/libcommon.a
-OBJS = cgpt_test.o
-OUT = cgpt_test
+OBJS = cgptlib_test.o quick_sort_test.o
+OUT = cgptlib_test
 
 all: $(OUT)
 

cgptlib/tests/cgptlib_test.c

@@ -3,10 +3,10 @@
  * found in the LICENSE file.
  */
 
-#include "cgpt_test.h"
+#include "cgptlib_test.h"
 #include <string.h>
-#include "cgpt.h"
-#include "cgpt_internal.h"
+#include "cgptlib.h"
+#include "cgptlib_internal.h"
 #include "crc32.h"
 #include "gpt.h"
 #include "quick_sort_test.h"

cgptlib/tests/cgptlib_test.h

@@ -2,8 +2,8 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#ifndef VBOOT_REFERENCE_CGPT_TEST_H_
-#define VBOOT_REFERENCE_CGPT_TEST_H_
+#ifndef VBOOT_REFERENCE_CGPTLIB_TEST_H_
+#define VBOOT_REFERENCE_CGPTLIB_TEST_H_
 
 #include <stdio.h>
 
@@ -31,4 +31,4 @@ typedef int (*test_func)(void);
     } \
   } while (0)
 
-#endif  /* VBOOT_REFERENCE_CGPT_TEST_H_ */
+#endif  /* VBOOT_REFERENCE_CGPTLIB_TEST_H_ */

cgptlib/tests/quick_sort_test.c

@@ -4,7 +4,7 @@
  */
 
 #include "quick_sort_test.h"
-#include "cgpt_test.h"
+#include "cgptlib_test.h"
 #include "quick_sort.h"
 #include "utility.h"