Attachment 107094 Details for Bug 147802 – file.diff

[patch] file.diff

file.diff (text/plain), 2.65 KB, created by Christopher Sean Hilton on 2010-06-12 01:20:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christopher Sean Hilton

Created: 2010-06-12 01:20:02 UTC

Size: 2.65 KB

patch

obsolete

>--- src/Makefile.orig	2007-07-16 18:05:44.000000000 -0400
>+++ src/Makefile	2010-06-11 19:53:51.000000000 -0400
>@@ -1,12 +1,12 @@
>-CC:=gcc
>-CFLAGS:=$(CFLAGS) -O2 -Wall -I../../lib -I../include `pkg-config --cflags glib-2.0` -D_JCOMP -D_REENTRANT -DLIBIDN
>-#CFLAGS:=$(CFLAGS) -O2 -Wall -I../../lib -I../include `pkg-config --cflags glib-2.0` -D_JCOMP -D_REENTRANT -DLIBIDN -DHAVE_MYSQL
>-LIBS:=$(LIBS) -ljcomp -lm `pkg-config --libs glib-2.0` `pkg-config --libs gthread-2.0` -lexpat -lidn
>-#LIBS:=$(LIBS) -ljcomp -lm `pkg-config --libs glib-2.0` `pkg-config --libs gthread-2.0` -lexpat -lidn `mysql_config --libs`
>+CC?=gcc
>+CFLAGS+=  -Wall -I../../lib -I../include -I/usr/local/include `/usr/local/bin/pkg-config --cflags glib-2.0` -D_JCOMP -D_REENTRANT -DLIBIDN
>+#CFLAGS:=  -Wall -I../../lib -I../include `/usr/local/bin/pkg-config --cflags glib-2.0` -D_JCOMP -D_REENTRANT -DLIBIDN -DHAVE_MYSQL
>+LIBS:=$(LIBS) -ljcomp -lm `/usr/local/bin/pkg-config --libs glib-2.0` `/usr/local/bin/pkg-config --libs gthread-2.0` -lexpat -lidn
>+#LIBS:=$(LIBS) -ljcomp -lm `/usr/local/bin/pkg-config --libs glib-2.0` `/usr/local/bin/pkg-config --libs gthread-2.0` -lexpat -lidn `mysql_config --libs`
> LDFLAGS:=-L.
> 
> # Debug/Experimental
>-#CFLAGS:=$(CFLAGS) -pipe -Os -I../../jabberd -I../include 
>+#CFLAGS:= -pipe -Os -I../../jabberd -I../include 
> #LIBS:=$(LIBS) /usr/local/lib/ccmalloc-gcc.o -lccmalloc 
> #LIBS:=$(LIBS) -lmemusage
> #LIBS:=$(LIBS) -lmcheck
>--- src/jabberd/Makefile.orig	2008-03-25 12:50:13.000000000 -0400
>+++ src/jabberd/Makefile	2010-06-11 19:54:04.000000000 -0400
>@@ -1,6 +1,6 @@
> 
>-CC=gcc
>-CFLAGS:=$(CFLAGS) -O2 -Wall -I. -I../../include `pkg-config --cflags glib-2.0` -D_REENTRANT -DLIBIDN
>+CC?=gcc
>+CFLAGS+=  -Wall -I. -I../../include -I/usr/local/include `/usr/local/bin/pkg-config --cflags glib-2.0` -D_REENTRANT -DLIBIDN
> LIBS=
> 
> JCOMP_LIB_OBJECTS=expat.o \
>--- src/jcomp/Makefile.orig	2008-03-25 12:50:13.000000000 -0400
>+++ src/jcomp/Makefile	2010-06-11 19:54:14.000000000 -0400
>@@ -1,7 +1,7 @@
> 
> #  $Id: Makefile,v 1.1 2005/12/06 14:48:49 peregrine Exp $
>-CC=gcc
>-CFLAGS:=$(CFLAGS) -O2 -Wall -I../../include -I. `pkg-config --cflags glib-2.0` -D_REENTRANT
>+CC?=gcc
>+CFLAGS+=  -Wall -I../../include -I. -I/usr/local/include `/usr/local/bin/pkg-config --cflags glib-2.0` -D_REENTRANT
> LIBS=
> 
> JCOMP_OBJECTS=jcr_xdb.o \
>@@ -15,7 +15,7 @@
> 
> 
> all: $(JCOMP_OBJECTS) main.o
>-	gcc -g $(JCOMP_OBJECTS) main.o ../libjcomp.a `pkg-config --libs gthread-2.0` `pkg-config --libs glib-2.0` -o main
>+	$(CC) -g $(JCOMP_OBJECTS) main.o ../libjcomp.a `/usr/local/bin/pkg-config --libs gthread-2.0` `/usr/local/bin/pkg-config --libs glib-2.0` -o main
> 
> lib: $(JCOMP_OBJECTS)
> 	@ar rv ../libjcomp.a $(JCOMP_OBJECTS)

Actions: View | Diff

Attachments on bug 147802: 107094