[G15daemon-commits] SF.net SVN: g15daemon: [60] trunk/g15daemon

[<ane...@us...>]

Revision: 60
          http://svn.sourceforge.net/g15daemon/?rev=60&view=rev
Author:   aneurysm9
Date:     2006-10-28 14:05:13 -0700 (Sat, 28 Oct 2006)

Log Message:
-----------
Add g15logo.h to g15daemon/Makefile.am
Update Makefile.in to reflect debian dir

Modified Paths:
--------------
    trunk/g15daemon/Makefile.in
    trunk/g15daemon/g15daemon/Makefile.am

Modified: trunk/g15daemon/Makefile.in
===================================================================
--- trunk/g15daemon/Makefile.in	2006-10-28 20:37:56 UTC (rev 59)
+++ trunk/g15daemon/Makefile.in	2006-10-28 21:05:13 UTC (rev 60)
@@ -101,6 +101,7 @@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
+GREP = @GREP@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -125,12 +126,9 @@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -147,23 +145,30 @@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
@@ -171,6 +176,7 @@
 LLIBDIR = @LIBDIR@
 SUBDIRS = libg15daemon_client g15daemon
 INCLUDES = -I$(top_srcdir)/libg15daemon_client -I$(top_srcdir)/g15daemon
+EXTRA_DIST = debian
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -413,6 +419,9 @@
 	      || exit 1; \
 	  fi; \
 	done
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  dist-hook
 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
@@ -594,7 +603,7 @@
 .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
 	check-am clean clean-generic clean-libtool clean-recursive \
 	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-	dist-shar dist-tarZ dist-zip distcheck distclean \
+	dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
 	distclean-generic distclean-hdr distclean-libtool \
 	distclean-recursive distclean-tags distcleancheck distdir \
 	distuninstallcheck dvi dvi-am html html-am info info-am \
@@ -606,6 +615,9 @@
 	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
 	tags tags-recursive uninstall uninstall-am uninstall-info-am
 
+
+dist-hook:
+	rm -rf `find $(distdir)/debian -name .svn`
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

Modified: trunk/g15daemon/g15daemon/Makefile.am
===================================================================
--- trunk/g15daemon/g15daemon/Makefile.am	2006-10-28 20:37:56 UTC (rev 59)
+++ trunk/g15daemon/g15daemon/Makefile.am	2006-10-28 21:05:13 UTC (rev 60)
@@ -2,8 +2,10 @@
 METASOURCES = AUTO
 sbin_PROGRAMS = g15daemon
 noinst_PROGRAMS = g15daemontest
+noinst_HEADERS = g15logo.h
 g15daemon_SOURCES = g15_net.c g15_uinput.c logo.h utility_funcs.c \
 	g15daemon.h main.c
 g15daemontest_SOURCES = lcdclient_test.c
 INCLUDES = -I$(top_builddir)/libg15daemon_client/
-g15daemontest_LDADD = $(top_builddir)/libg15daemon_client/libg15daemon_client.la
\ No newline at end of file
+g15daemontest_LDADD = $(top_builddir)/libg15daemon_client/libg15daemon_client.la
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.