Shifted to using autotools

.gitignore

@@ -5,3 +5,18 @@ print_backend_cups
 .gdb_history
 gmon.out
 Makefile.in
+.gitignore
+aclocal.m4
+Makefile
+*/Makefile
+depcomp
+install-sh
+missing
+aclocal.*
+compile
+autom4*
+config.log
+config.status
+configure
+data/org.openprinting.Backend.CUPS.service
+src/.deps

Makefile.am

@@ -0,0 +1,2 @@
+AUTOMAKE_OPTIONS = foreign
+SUBDIRS = src data

configure.ac

@@ -0,0 +1,34 @@
+#                                               -*- Autoconf -*- 
+# Process this file with autoconf to produce a configure script. 
+
+AC_PREREQ([2.69]) 
+AC_INIT([COMMON-PRINT-BACKEND-CUPS],[1.0],[[email protected]]) 
+AM_INIT_AUTOMAKE([-Wall foreign]) 
+AC_CONFIG_SRCDIR([src/print_backend_cups.c]) 
+
+# Check for a C compiler 
+AC_PROG_CC 
+
+
+# Checks for backend library 
+PKG_CHECK_MODULES([CPDBackend],[CPDBackend]) 
+PKG_CHECK_MODULES([GIO],[gio-2.0]) 
+PKG_CHECK_MODULES([GIOUNIX],[gio-unix-2.0]) 
+PKG_CHECK_MODULES([GLIB],[glib-2.0]) 
+
+# Checks for header files. 
+AC_CHECK_HEADERS([stdlib.h string.h cups/cups.h]) 
+
+# Checks for typedefs, structures, and compiler characteristics. 
+AC_TYPE_SIZE_T 
+
+# Checks for library functions. 
+AC_FUNC_MALLOC 
+
+# The Dbus service directory 
+AC_DEFINE_UNQUOTED(DBUS_SERVICES_DIR, "/usr/share/dbus-1/services", [Where services dir for DBUS is]) 
+
+#The info directory which will be read by the frontend 
+AC_DEFINE_UNQUOTED(INFO_DIR, "/usr/share/print-backends", [The directory consulted by the frontends]) 
+
+AC_OUTPUT([Makefile src/Makefile data/Makefile])

data/Makefile.am

@@ -0,0 +1,13 @@
+# Dbus service file
+servicedir = /usr/share/dbus-1/services
+service_in_files = org.openprinting.Backend.CUPS.service.in
+service_DATA = $(service_in_files:.service.in=.service)
+
+$(service_DATA): $(service_in_files) Makefile
+	@sed -e "s|\@bindir\@|$(bindir)|" $<> $@
+
+info_backenddir = /usr/share/print-backends
+info_backend_DATA = org.openprinting.Backend.CUPS
+
+clean-local:
+	rm -rf $(service_DATA)

aux/org.openprinting.Backend.CUPS.service → data/org.openprinting.Backend.CUPS.service.in

@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.openprinting.Backend.CUPS
-Exec=/usr/bin/print-backends/cups
+Exec=@bindir@/print_backend_cups

src/Makefile.am

@@ -0,0 +1,12 @@
+bin_PROGRAMS = print_backend_cups
+print_backend_cups_SOURCES = print_backend_cups.c backend_helper.c 
+print_backend_cups_CPPFLAGS  = $(CPDBackend_CFLAGS)
+print_backend_cups_CPPFLAGS += $(GLIB_CFLAGS)
+print_backend_cups_CPPFLAGS += $(GIO_CFLAGS)
+print_backend_cups_CPPFLAGS += $(GIOUNIX_CFLAGS)
+
+print_backend_cups_LDADD  =  $(CPDBackend_LIBS)
+print_backend_cups_LDADD += -lcups -lpthread -lm -lcrypt
+print_backend_cups_LDADD += $(GLIB_LIBS)
+print_backend_cups_LDADD += $(GIO_LIBS)
+print_backend_cups_LDADD += $(GIOUNIX_LIBS)

src/backend_helper.c

@@ -13,6 +13,7 @@ BackendObj *get_new_BackendObj()
     b->num_frontends = 0;
     b->obj_path = NULL;
     b->default_printer = NULL;
+    return b;
 }
 
 /** Don't free the returned value; it is owned by BackendObj */
@@ -82,9 +83,11 @@ void add_frontend(BackendObj *b, const char *dialog_name)
 void remove_frontend(BackendObj *b, const char *dialog_name)
 {
     Dialog *d = (Dialog *)(g_hash_table_lookup(b->dialogs, dialog_name));
-    g_hash_table_remove(b->dialogs, dialog_name);
-    b->num_frontends--;
-
+    if (d)
+    {
+        g_hash_table_remove(b->dialogs, dialog_name);
+        b->num_frontends--;
+    }
     g_message("Removed Frontend entry for %s", dialog_name);
 }
 gboolean no_frontends(BackendObj *b)
@@ -93,7 +96,7 @@ gboolean no_frontends(BackendObj *b)
         return TRUE;
     return FALSE;
 }
-Dialog *find_dialog(BackendObj *b , const char* dialog_name)
+Dialog *find_dialog(BackendObj *b, const char *dialog_name)
 {
     Dialog *d = (Dialog *)(g_hash_table_lookup(b->dialogs, dialog_name));
     return d;
@@ -673,10 +676,9 @@ int print_file(PrinterCUPS *p, const char *file_path, int num_settings, GVariant
         num_options = cupsAddOption(option_name, option_value, num_options, &options);
     }
     char *file_name = extract_file_name(file_path);
-    ipp_status_t job_status;
     int job_id = 0;
-    job_status = cupsCreateDestJob(p->http, p->dest, p->dinfo,
-                                   &job_id, file_name, num_options, options);
+    cupsCreateDestJob(p->http, p->dest, p->dinfo,
+                      &job_id, file_name, num_options, options);
     if (job_id)
     {
         /** job creation was successful , 
@@ -801,6 +803,7 @@ Dialog *get_new_Dialog()
     d->printers = g_hash_table_new_full(g_str_hash, g_str_equal,
                                         (GDestroyNotify)free_string,
                                         (GDestroyNotify)free_PrinterCUPS);
+    return d;
 }
 
 void free_Dialog(Dialog *d)
@@ -1052,6 +1055,8 @@ char *translate_job_state(ipp_jstate_t state)
         return JOB_STATE_STOPPED;
     case IPP_JSTATE_COMPLETED:
         return JOB_STATE_COMPLETED;
+    default:
+        return "NA";
     }
 }
 

src/print_backend_cups.c

@@ -80,6 +80,7 @@ gpointer list_printers(gpointer _dialog_name)
                   _dialog_name);
 
     g_message("Exiting thread for dialog at %s\n", dialog_name);
+    return NULL;
 }
 
 int send_printer_added(void *_dialog_name, unsigned flags, cups_dest_t *dest)
@@ -279,6 +280,7 @@ static gboolean on_handle_print_file(PrintBackend *interface,
         g_message("No frontends connected .. exiting backend.\n");
         exit(EXIT_SUCCESS);
     }
+    return TRUE;
 }
 
 static gboolean on_handle_get_all_options(PrintBackend *interface,
@@ -290,8 +292,6 @@ static gboolean on_handle_get_all_options(PrintBackend *interface,
     PrinterCUPS *p = get_printer_by_name(b, dialog_name, printer_name);
     Option *options;
     int count = get_all_options(p, &options);
-    int i;
-
     GVariantBuilder *builder;
     GVariant *variant;
     builder = g_variant_builder_new(G_VARIANT_TYPE("a(ssia(s))"));
@@ -374,7 +374,7 @@ static gboolean on_handle_replace(PrintBackend *interface,
     {
         g_hash_table_steal(b->dialogs, previous_name);
         g_hash_table_insert(b->dialogs, get_string_copy(dialog_name), d);
-        g_message("Replaced %s --> %s\n", previous_name , dialog_name); 
+        g_message("Replaced %s --> %s\n", previous_name, dialog_name);
     }
     print_backend_complete_replace(interface, invocation);
     return TRUE;