From: Ray Strode <rstrode@redhat.com>
Date: Sun, 4 Nov 2007 03:30:16 +0000 (-0400)
Subject: Merge branch 'main-refactor'
X-Git-Tag: 0.1.0~143
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92c2bf0f4bd8aa575689b96276bec6b65d330d10;p=thirdparty%2Fplymouth.git

Merge branch 'main-refactor'
---

92c2bf0f4bd8aa575689b96276bec6b65d330d10
diff --cc src/rhgb-client/Makefile.am
index 39c5024a,20e6dc74..8cad7df5
--- a/src/rhgb-client/Makefile.am
+++ b/src/rhgb-client/Makefile.am
@@@ -1,17 -1,15 +1,16 @@@
- SUBDIRS = tests
  INCLUDES = -I$(top_srcdir)                                                    \
-            -I$(srcdir)/../libply                                              \
-            -I$(srcdir)/..                                                     \
+            -I$(top_srcdir)/src                                                \
+            -I$(top_srcdir)/src/libply                                         \
             -I$(srcdir)
+ rhgb_clientdir = $(bindir)
+ rhgb_client_PROGRAMS = rhgb-client 
  
- bin_PROGRAMS = rhgb-client 
- 
- rhgb_client_CFLAGS = $(PLYMOUTH_CFLAGS)
+ rhgb_client_CFLAGS = $(PLYMOUTH_CFLAGS) -DPLYMOUTH_PLUGIN_PATH=\"$(prefix)/\$${LIB}/plymouth/\"
  rhgb_client_LDADD = $(PLYMOUTH_LIBS) ../libply/libply.la
 -rhgb_client_SOURCES =                                                          \
 -                   ply-boot-client.h                                          \
 -                   ply-boot-client.c                                          \
 -	           rhgb-client.c
 +rhgb_client_SOURCES = \
 +		      $(srcdir)/../ply-boot-protocol.h                        \
 +                      $(srcdir)/ply-boot-client.h                             \
 +                      $(srcdir)/ply-boot-client.c                             \
 +                      $(srcdir)/rhgb-client.c
  
  MAINTAINERCLEANFILES = Makefile.in