summaryrefslogtreecommitdiff
path: root/wm/fluxbox/patches/patch-ab
blob: 06ec5836dce13e72fc98b23915fe8be471a7634e (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
$NetBSD: patch-ab,v 1.4 2002/08/25 21:51:32 jlam Exp $

--- src/Makefile.in.orig	Sat Apr 20 06:11:45 2002
+++ src/Makefile.in
@@ -152,6 +152,10 @@ fluxbox_LDADD = $(LDADD)
 fluxbox_DEPENDENCIES = 
 fluxbox_LDFLAGS = 
 CXXFLAGS = @CXXFLAGS@
+CXXFLAGS_NOOPT = $(CXXFLAGS:C/-O[1-9]*//)
+CPPFLAGS_NOOPT = $(CPPFLAGS:C/-O[1-9]*//)
+CXXCOMPILE_NOOPT = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_NOOPT) $(AM_CXXFLAGS) $(CXXFLAGS_NOOPT)
+LTCXXCOMPILE_NOOPT = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_NOOPT) $(AM_CXXFLAGS) $(CXXFLAGS_NOOPT)
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
@@ -171,9 +175,12 @@ GZIP_ENV = --best
 SOURCES = $(fluxbox_SOURCES)
 OBJECTS = $(fluxbox_OBJECTS)
 
+Image.o: Image.C
+Image.lo: Image.C
+
 all: all-redirect
 .SUFFIXES:
-.SUFFIXES: .S .c .cc .lo .o .obj .s
+.SUFFIXES: .S .c .cc .C .lo .o .obj .s
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/Makefile
 
@@ -254,10 +261,16 @@ maintainer-clean-libtool:
 fluxbox$(EXEEXT): $(fluxbox_OBJECTS) $(fluxbox_DEPENDENCIES)
 	@rm -f fluxbox$(EXEEXT)
 	$(CXXLINK) $(fluxbox_LDFLAGS) $(fluxbox_OBJECTS) $(fluxbox_LDADD) $(LIBS)
+.cc.C:
+	cp -f $< $@
+.C.o:
+	$(CXXCOMPILE_NOOPT) -c $<
 .cc.o:
 	$(CXXCOMPILE) -c $<
 .cc.obj:
 	$(CXXCOMPILE) -c `cygpath -w $<`
+.C.lo:
+	$(LTCXXCOMPILE_NOOPT) -c $<
 .cc.lo:
 	$(LTCXXCOMPILE) -c $<