Seperated source changes from patch that had debian commits
authorKarthik Ramanan <a0393906@ti.com>
Thu, 1 Jan 1970 01:15:09 +0000 (01:15 +0000)
committerKarthik Ramanan <a0393906@ti.com>
Thu, 1 Jan 1970 01:15:09 +0000 (01:15 +0000)
Changes seperated from the below commit:
Changed the path of XML for make install Added Debian
Packaging Directory

Signed-off-by: Ankur Agarwal <ankuragarwal@ti.com>
Signed-off-by: Karthik Ramanan <a0393906@ti.com>
Makefile.in
autogen.sh
configure.ac
include/gui.h

index c365d76276d6f4746201561b91f36f80843d4a14..242bba7ffce183f229e6118ce216eef91ba80bbc 100644 (file)
@@ -63,7 +63,10 @@ libdir          = @libdir@
 docdir          = @docdir@
 datarootdir     = @datarootdir@
 datadir         = @datadir@
+ifdef DESTDIR
+else
 DESTDIR         =
+endif
 DOXYGEN         = doxygen
 
 
@@ -72,10 +75,11 @@ DOXYGEN         = doxygen
 #
 
 INC_DIR := include
+INC_CONFIG := .
 
 PKG_CONFIG_CFLAGS  := `pkg-config --cflags gtk+-2.0 gstreamer-0.10 gstreamer-interfaces-0.10`
 CFLAGS += -Wall -ansi -pedantic  -std=c99
-CFLAGS += -I$(INC_DIR) -DGST_APP_DEBUG  $(PKG_CONFIG_CFLAGS)
+CFLAGS += -I$(INC_DIR) -I$(INC_CONFIG) -DGST_APP_DEBUG  $(PKG_CONFIG_CFLAGS)
 
 PKG_CONFIG_LDFLAGS := `pkg-config --libs gtk+-2.0 gstreamer-0.10 gstreamer-interfaces-0.10`
 LDFLAGS +=  $(PKG_CONFIG_LDFLAGS)
@@ -119,11 +123,15 @@ distclean: clean
        $(Q)$(RM) -rf config.h config.status config.log configure \
                aclocal.m4 Makefile autom4te.cache
 
-
 install:
        install -d $(DESTDIR)$(bindir) $(DESTDIR)$(docdir)
        install dual-decode $(DESTDIR)$(bindir)
+       install res/gui.xml $(DESTDIR)$(datadir)/$(PACKAGE_NAME)
 
+uninstall:
+       rm -r $(DESTDIR)$(docdir)
+       rm -r $(DESTDIR)$(bindir)/$(PACKAGE_NAME)
+       rm -r $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/gui.xml
 
 doxygen:
        $(Q)$(DOXYGEN)
index 4a01f6183ea11eba3687b660b18695513f06e468..f84258811dabc7fae924870642bd18921063f454 100755 (executable)
@@ -40,4 +40,4 @@
 #
 #
 
-aclocal && autoheader && autoconf
\ No newline at end of file
+aclocal && autoheader && autoconf
index 7d8510533303974f9242b6dd7615012ec553a806..67642fcc80780550ddce5893afd7a0c38849869b 100644 (file)
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.68])
-AC_INIT(dual_decode,0.2, glsdk_apps@list.ti.com)
+AC_INIT(dual-decode,0.2, glsdk_apps@list.ti.com)
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_HEADERS([config.h])
 
@@ -22,6 +22,8 @@ PKG_CHECK_MODULES([GST], [gstreamer-0.10])
 PKG_CHECK_MODULES([GSTINT], [gstreamer-interfaces-0.10])
 PKG_CHECK_MODULES([GTK], [gtk+-2.0]) 
 
+AC_DEFINE_UNQUOTED(GUI_XML, ["${prefix}/share/dual-decode/gui.xml]",["Defines the path of the Glade File"])
+
 # Checks for header files.
 
 # Checks for typedefs, structures, and compiler characteristics.
index b5aaddd587ba70519129e5cda23e1ce2b03f7f28..6bbf2c793335c120f41971e53f60c5ce0c5564d2 100644 (file)
@@ -51,7 +51,7 @@
 \r
 #include <gtk/gtk.h>\r
 #include <gst/gst.h>\r
-\r
+#include "config.h"\r
 /******************************************************************************\r
  \r
                          Structure Definitions\r
@@ -157,8 +157,6 @@ typedef struct{
 #define TIMER_INTERVAL 1000\r
 #define TIMER_SIGNAL_NONE 0\r
 \r
-/*The glade file to import widgets from*/\r
-#define GLADE_FILE "res/gui.xml"\r
 \r
 /******************************************************************************\r
  \r
@@ -197,7 +195,7 @@ static inline void DualDecode_builderClose() {
 }\r
 static inline void DualDecode_builderCreate() {\r
        builder = gtk_builder_new();\r
-       if(0 == gtk_builder_add_from_file (builder,GLADE_FILE,&error)){\r
+       if(0 == gtk_builder_add_from_file (builder,GUI_XML,&error)){\r
                DualDecode_checkError();\r
                DualDecode_builderClose();\r
        }\r