diff --git a/frontends/gtk-old/configure.in b/frontends/gtk-old/configure.in index 0b5a39bff..b43eaad50 100644 --- a/frontends/gtk-old/configure.in +++ b/frontends/gtk-old/configure.in @@ -54,4 +54,3 @@ src/Makefile intl/Makefile po/Makefile.in ]) - diff --git a/frontends/gtk-old/src/Makefile.am b/frontends/gtk-old/src/Makefile.am index 9af69f028..f966890a7 100644 --- a/frontends/gtk-old/src/Makefile.am +++ b/frontends/gtk-old/src/Makefile.am @@ -4,6 +4,9 @@ INCLUDES = \ -I$(top_srcdir)/intl \ @GTK_CFLAGS@ +CFLAGS = @CFLAGS@ `gphoto2-config --cflags` +LDFLAGS = @LDFLAGS@ `gphoto2-config --libs` + bin_PROGRAMS = gphoto2_gtk gphoto2_gtk_SOURCES = \ @@ -12,4 +15,4 @@ gphoto2_gtk_SOURCES = \ interface.c interface.h \ callbacks.c callbacks.h -gphoto2_gtk_LDADD = @GTK_LIBS@ $(INTLLIBS) +gphoto2_gtk_LDADD = @GTK_LIBS@ $(INTLLIBS) diff --git a/frontends/gtk-old/src/interface.c b/frontends/gtk-old/src/interface.c index fc43259cf..a67abaa41 100644 --- a/frontends/gtk-old/src/interface.c +++ b/frontends/gtk-old/src/interface.c @@ -13,11 +13,33 @@ #include #include +#include #include "callbacks.h" #include "interface.h" #include "support.h" +int interface_message(char *message) { + + return (GP_OK); +} + +int interface_status(char *message) { + + return (GP_OK); +} + +int interface_progress(float percentage) { + + return (GP_OK); +} + +int interface_confirm(char *message) { + + return (GP_OK); +} + + GtkWidget* create_main_window (void) { @@ -1562,4 +1584,3 @@ create_select_camera_window (void) return select_camera_window; } - diff --git a/frontends/gtk-old/src/interface.h b/frontends/gtk-old/src/interface.h index 0527547dd..92afced1a 100644 --- a/frontends/gtk-old/src/interface.h +++ b/frontends/gtk-old/src/interface.h @@ -7,3 +7,8 @@ GtkWidget* create_message_window_long (void); GtkWidget* create_confirm_window (void); GtkWidget* create_message_window (void); GtkWidget* create_select_camera_window (void); + +int interface_message(char *message); +int interface_status(char *message); +int interface_progress(float percentage); +int interface_confirm(char *message); diff --git a/frontends/gtk-old/src/main.c b/frontends/gtk-old/src/main.c index 40d580c5a..ff2b89a47 100644 --- a/frontends/gtk-old/src/main.c +++ b/frontends/gtk-old/src/main.c @@ -8,7 +8,7 @@ #endif #include -#include +#include #include "interface.h" #include "support.h" @@ -41,7 +41,7 @@ main (int argc, char *argv[]) */ main_window = create_main_window (); gtk_widget_show (main_window); - + /* message_window_long = create_message_window_long (); gtk_widget_show (message_window_long); diff --git a/libgphoto2/Makefile.am b/libgphoto2/Makefile.am index 26d0abc5f..84b0666a9 100644 --- a/libgphoto2/Makefile.am +++ b/libgphoto2/Makefile.am @@ -5,8 +5,9 @@ CFLAGS= @CFLAGS@ \ -Wall \ -I$(top_srcdir)/include \ -DCAMLIBS=\"$(pkglibdir)\" \ - -DDEBUG -LDFLAGS = @LDFLAGS@ -g + -DDEBUG \ + `gpio-config --cflags` +LDFLAGS = @LDFLAGS@ -g `gpio-config --libs` libgphoto2_la_LDFLAGS = -version-info 0:0:0 libgphoto2_la_SOURCES = \