Mercurial Mercurial > upstream > spec-files-extra / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/mugshot-03-Ispace.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 547 e9deddedd4d8
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
547
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
     1
 
--- mugshot-1.1.56/Makefile-libhippofirefox.am.orig	2007-10-14 21:38:33.026337000 -0400
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
     2
 
+++ mugshot-1.1.56/Makefile-libhippofirefox.am	2007-10-14 21:39:00.374671000 -0400
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
     3
 
@@ -56,30 +56,30 @@
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
     4
 
 libhippofirefox_la_CPPFLAGS =			\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
     5
 
 	$(AM_CPPFLAGS)				\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
     6
 
 	$(LIBHIPPOFIREFOX_CFLAGS)		\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
     7
 
-	-I $(FIREFOX_SRCDIR)/include		\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
     8
 
-	-I $(COMMONSRCDIR)/hippoipc		\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
     9
 
-	-I config/hippo
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    10
 
+	-I$(FIREFOX_SRCDIR)/include		\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    11
 
+	-I$(COMMONSRCDIR)/hippoipc		\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    12
 
+	-Iconfig/hippo
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    13
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    14
 
 # The include of $(GECKO_INCLUDEDIR) in the FULL_GECKO case is for
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    15
 
 # Ubuntu, which has a mix of the gecko-sdk directory arrangement
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    16
 
 # with including the full set of headers
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    17
 
 if HAVE_FULL_GECKO
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    18
 
 libhippofirefox_la_CPPFLAGS +=			\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    19
 
-	-I $(GECKO_INCLUDEDIR)			\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    20
 
-	-I $(GECKO_INCLUDEDIR)/caps		\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    21
 
-	-I $(GECKO_INCLUDEDIR)/docshell		\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    22
 
-	-I $(GECKO_INCLUDEDIR)/dom		\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    23
 
-	-I $(GECKO_INCLUDEDIR)/gfx		\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    24
 
-	-I $(GECKO_INCLUDEDIR)/js		\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    25
 
-	-I $(GECKO_INCLUDEDIR)/necko		\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    26
 
-	-I $(GECKO_INCLUDEDIR)/string		\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    27
 
-	-I $(GECKO_INCLUDEDIR)/widget		\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    28
 
-	-I $(GECKO_INCLUDEDIR)/xpcom		\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    29
 
-	-I $(GECKO_INCLUDEDIR)/xpconnect
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    30
 
+	-I$(GECKO_INCLUDEDIR)			\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    31
 
+	-I$(GECKO_INCLUDEDIR)/caps		\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    32
 
+	-I$(GECKO_INCLUDEDIR)/docshell		\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    33
 
+	-I$(GECKO_INCLUDEDIR)/dom		\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    34
 
+	-I$(GECKO_INCLUDEDIR)/gfx		\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    35
 
+	-I$(GECKO_INCLUDEDIR)/js		\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    36
 
+	-I$(GECKO_INCLUDEDIR)/necko		\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    37
 
+	-I$(GECKO_INCLUDEDIR)/string		\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    38
 
+	-I$(GECKO_INCLUDEDIR)/widget		\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    39
 
+	-I$(GECKO_INCLUDEDIR)/xpcom		\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    40
 
+	-I$(GECKO_INCLUDEDIR)/xpconnect
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    41
 
 else
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    42
 
 libhippofirefox_la_CPPFLAGS +=			\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    43
 
-	-I $(GECKO_INCLUDEDIR)			\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    44
 
-	-I $(GECKO_PRIVATE_INCLUDEDIR)
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    45
 
+	-I$(GECKO_INCLUDEDIR)			\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    46
 
+	-I$(GECKO_PRIVATE_INCLUDEDIR)
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    47
 
 endif
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    48
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    49
 
 nodist_libhippofirefox_la_SOURCES=			\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    50
 
@@ -99,12 +99,12 @@
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    51
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    52
 
 if HAVE_FULL_GECKO
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    53
 
 XPIDL_INCLUDES =				\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    54
 
-	-I $(GECKO_IDLDIR)			\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    55
 
-	-I $(FIREFOX_SRCDIR)/public
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    56
 
+	-I$(GECKO_IDLDIR)			\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    57
 
+	-I$(FIREFOX_SRCDIR)/public
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    58
 
 else
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    59
 
 XPIDL_INCLUDES =				\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    60
 
-	-I $(GECKO_IDLDIR)			\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    61
 
-	-I $(FIREFOX_SRCDIR)/public
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    62
 
+	-I$(GECKO_IDLDIR)			\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    63
 
+	-I$(FIREFOX_SRCDIR)/public
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    64
 
 endif
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    65
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    66
 
 IDL_FILES =							\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    67
 
--- mugshot-1.1.56/Makefile-libhippoipc.am.orig	2007-10-14 21:45:28.763275000 -0400
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    68
 
+++ mugshot-1.1.56/Makefile-libhippoipc.am	2007-10-14 21:45:41.432192000 -0400
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    69
 
@@ -3,7 +3,7 @@
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    70
 
 libhippoipc_la_CPPFLAGS =			\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    71
 
 	$(AM_CPPFLAGS)				\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    72
 
 	$(LIBHIPPOIPC_CFLAGS)			\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    73
 
-	-I $(COMMONSRCDIR)/hippoipc
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    74
 
+	-I$(COMMONSRCDIR)/hippoipc
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    75
 
 libhippoipc_la_LIBADD =
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    76
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    77
 
 nodist_libhippoipc_la_SOURCES =					\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    78
 
--- mugshot-1.1.56/Makefile.am.orig	2007-10-14 21:46:10.340767000 -0400
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    79
 
+++ mugshot-1.1.56/Makefile.am	2007-10-14 21:46:16.778737000 -0400
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    80
 
@@ -52,8 +52,8 @@
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    81
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    82
 
 if USE_INCLUDED_CANVAS
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    83
 
 CANVAS_CFLAGS =				\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    84
 
-	-I $(CANVASSRCDIR)/common	\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    85
 
-	-I $(CANVASSRCDIR)/linux
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    86
 
+	-I$(CANVASSRCDIR)/common	\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    87
 
+	-I$(CANVASSRCDIR)/linux
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    88
 
 CANVAS_LIBADD= libhippocanvas-1.la
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    89
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    90
 
 include Makefile-libhippocanvas.am
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    91
 
--- mugshot-1.1.56/Makefile-mugshot.am.orig	2007-10-14 21:46:28.998151000 -0400
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    92
 
+++ mugshot-1.1.56/Makefile-mugshot.am	2007-10-14 21:46:37.467872000 -0400
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    93
 
@@ -2,7 +2,7 @@
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    94
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    95
 
 mugshot_CPPFLAGS = 			\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    96
 
 	$(AM_CPPFLAGS)			\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    97
 
-	-I $(top_srcdir)		\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    98
 
+	-I$(top_srcdir)		\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
    99
 
 	$(MUGSHOT_CFLAGS)		\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
   100
 
 	$(CANVAS_CFLAGS)		\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
   101
 
        -DHOST_CPU=\"$(host_cpu)\"	\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
   102
 
--- mugshot-1.1.56/Makefile-libddm.am.orig	2007-10-14 21:47:00.426244000 -0400
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
   103
 
+++ mugshot-1.1.56/Makefile-libddm.am	2007-10-14 21:47:05.261093000 -0400
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
   104
 
@@ -6,7 +6,7 @@
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
   105
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
   106
 
 libddm_1_la_CPPFLAGS =			\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
   107
 
 	$(AM_CPPFLAGS)			\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
   108
 
-	-I $(MARSHAL_DIR)		\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
   109
 
+	-I$(MARSHAL_DIR)		\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
   110
 
 	$(LIBDDM_CFLAGS)		\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
   111
 
 	 -DDDM_COMPILATION=1
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
   112
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
   113
 
--- mugshot-1.1.56/Makefile-libhippo.am.orig	2007-10-14 21:47:22.326299000 -0400
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
   114
 
+++ mugshot-1.1.56/Makefile-libhippo.am	2007-10-14 21:47:33.719886000 -0400
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
   115
 
@@ -2,7 +2,7 @@
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
   116
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
   117
 
 libhippo_la_CPPFLAGS =			\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
   118
 
 	$(AM_CPPFLAGS)			\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
   119
 
-	-I $(MARSHAL_DIR)		\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
   120
 
+	-I$(MARSHAL_DIR)		\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
   121
 
 	$(CANVAS_CFLAGS)		\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
   122
 
 	$(LIBHIPPO_CFLAGS)		\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
   123
 
 	-DDDM_I_KNOW_THIS_IS_UNSTABLE=1
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
   124
 
--- mugshot-1.1.56/Makefile-libhippocanvas.am.orig	2007-10-14 21:47:59.745090000 -0400
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
   125
 
+++ mugshot-1.1.56/Makefile-libhippocanvas.am	2007-10-14 21:48:03.375862000 -0400
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
   126
 
@@ -4,7 +4,7 @@
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
   127
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
   128
 
 libhippocanvas_1_la_CPPFLAGS =		\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
   129
 
 	$(AM_CPPFLAGS)			\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
   130
 
-	-I $(MARSHAL_DIR)		\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
   131
 
+	-I$(MARSHAL_DIR)		\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
   132
 
 	$(CANVAS_CFLAGS)		\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
   133
 
 	$(LIBHIPPOCANVAS_CFLAGS)
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
   134
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
   135
 
--- mugshot-1.1.56/Makefile-test-hippo-ipc.am.orig	2007-10-14 21:48:15.639587000 -0400
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
   136
 
+++ mugshot-1.1.56/Makefile-test-hippo-ipc.am	2007-10-14 21:48:23.078698000 -0400
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
   137
 
@@ -2,7 +2,7 @@
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
   138
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
   139
 
 test_hippo_ipc_CPPFLAGS =		\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
   140
 
 	$(AM_CPPFLAGS)			\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
   141
 
-	-I $(COMMONSRCDIR)/hippoipc	\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
   142
 
+	-I$(COMMONSRCDIR)/hippoipc	\
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
   143
 
 	$(TEST_HIPPO_IPC_CFLAGS)
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
   144
e9deddedd4d8 2007-10-14 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset 
   145
 
 test_hippo_ipc_LDFLAGS=
upstream/spec-files-extra