lib: Rename assembling.[ch]

This is already self-contained.

libfprint/drivers/aeslib.c

@@ -27,7 +27,7 @@
 #include <glib.h>
 
 #include "fpi-usb.h"
-#include "assembling.h"
+#include "fpi-assembling.h"
 #include "aeslib.h"
 
 #define MAX_REGWRITES_PER_REQUEST	16

libfprint/drivers_api.h

@@ -36,7 +36,7 @@
 #include "fpi-usb.h"
 #include "fpi-data.h"
 #include "fpi-img.h"
-#include "assembling.h"
+#include "fpi-assembling.h"
 #include "drivers/driver_ids.h"
 
 libusb_device_handle *fpi_dev_get_usb_dev(struct fp_dev *dev);

libfprint/fpi-assembling.c

@@ -29,7 +29,7 @@
 #include <libusb.h>
 #include <glib.h>
 
-#include "assembling.h"
+#include "fpi-assembling.h"
 
 static unsigned int calc_error(struct fpi_frame_asmbl_ctx *ctx,
 			       struct fpi_frame *first_frame,

libfprint/fpi-assembling.h

@@ -1,6 +1,4 @@
 /*
- * Image assembling routines
- * Shared functions between libfprint Authentec drivers
  * Copyright (C) 2007 Daniel Drake <dsd@gentoo.org>
  * Copyright (C) 2015 Vasily Khoruzhick <anarsoul@gmail.com>
  *
@@ -19,8 +17,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef __ASSEMBLING_H__
-#define __ASSEMBLING_H__
+#ifndef __FPI_ASSEMBLING_H__
+#define __FPI_ASSEMBLING_H__
 
 #include <fprint.h>
 

libfprint/meson.build

@@ -4,6 +4,8 @@ libfprint_sources = [
     'fpi-async.c',
     'fpi-async.h',
     'core.c',
+    'fpi-assembling.c',
+    'fpi-assembling.h',
     'fpi-data.c',
     'fpi-data.h',
     'fpi-dev.c',
@@ -19,8 +21,6 @@ libfprint_sources = [
     'fpi-usb.h',
     'fpi-usb.c',
     'imgdev.c',
-    'assembling.c',
-    'assembling.h',
     'drivers/driver_ids.h',
 ]