head	1.4;
access;
symbols
	RELEASE_5_2_1:1.3
	RELEASE_5_2_0:1.3
	RELEASE_4_9_0:1.3
	RELEASE_5_1_0:1.3
	RELEASE_4_8_0:1.3
	RELEASE_5_0_0:1.3
	RELEASE_4_7_0:1.3
	RELEASE_4_6_2:1.3
	RELEASE_4_6_1:1.3
	RELEASE_4_6_0:1.3
	RELEASE_5_0_DP1:1.3
	RELEASE_4_5_0:1.3
	RELEASE_4_4_0:1.3
	RELEASE_4_3_0:1.3
	RELEASE_4_2_0:1.3
	RELEASE_4_1_1:1.3
	RELEASE_4_1_0:1.3
	RELEASE_3_5_0:1.2
	RELEASE_4_0_0:1.2
	RELEASE_3_4_0:1.2
	RELEASE_3_3_0:1.1.1.1
	v_0_3_1:1.1.1.1
	JIM:1.1.1;
locks; strict;
comment	@# @;


1.4
date	2004.01.03.13.52.19;	author pav;	state dead;
branches;
next	1.3;

1.3
date	2000.07.07.19.58.52;	author steve;	state Exp;
branches;
next	1.2;

1.2
date	99.09.20.00.43.11;	author steve;	state Exp;
branches;
next	1.1;

1.1
date	99.08.24.09.50.50;	author jim;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	99.08.24.09.50.50;	author jim;	state Exp;
branches;
next	;


desc
@@


1.4
log
@- Update to 0.5

PR:		ports/60855
Submitted by:	Vincent Tantardini <vinc@@FreeBSD-fr.0x45.org>
@
text
@--- Makefile.orig	Sun Jul 25 05:33:08 1999
+++ Makefile	Sat Jul  1 17:57:20 2000
@@@@ -2,14 +2,14 @@@@
 bindir		= $(prefix)/bin
 
 NAME		= erwin-0.3.1
-CC		= gcc
+CC		?= gcc
 PROG		= erwin
 OBJS		= erwin.o erwinmenu.o erwinfunctions.o erwintoolbar.o \
 		  erwinnotebook.o erwindialogs.o erwintags.o gtkmessage.o
 INSTALL		= install
-DEBUG		= -g -DDEBUG
+DEBUG		= # -g -DDEBUG
 
-CFLAGS		= -DNAME=\"$(NAME)\" $(DEBUG) -Wall -O2 -m486 -fno-strength-reduce -malign-functions=4 -malign-jumps=4 -malign-loops=4 -ffast-math -fexpensive-optimizations
+CFLAGS		+= -DNAME=\"$(NAME)\" $(DEBUG) -fno-strength-reduce -ffast-math -fexpensive-optimizations
 
 all: license $(PROG)
 
@@@@ -17,8 +17,7 @@@@
 	strip $(PROG)
 
 install:	strip
-	$(INSTALL) -d $(bindir)
-	$(INSTALL) -m 0755 $(PROG) $(bindir)
+	${BSD_INSTALL_PROGRAM} $(PROG) $(bindir)
 
 uninstall:
 	
@@@@ -28,10 +27,10 @@@@
 	rm -f $(PROG) $(OBJS) *.?~ core license.h
 
 $(PROG):	$(OBJS)
-	$(CC) $(LDFLAGS) $(shell gtk-config --libs) -o $@@ $(OBJS)
+	$(CC) $(LDFLAGS) `$(GTK_CONFIG) --libs` -o $@@ $(OBJS)
 
 %.o:		%.c
-	$(CC) $(CFLAGS) $(shell gtk-config --cflags) -o $@@ -c $<
+	$(CC) $(CFLAGS) `$(GTK_CONFIG) --cflags` -o $@@ -c $<
 
 tar:	clean
 	cd ..; ln -s erwin $(NAME);tar cf - $(NAME)/* > $(NAME).tar;rm $(NAME);gzip -f $(NAME).tar
@


1.3
log
@- Use GTK_CONFIG/GLIB_CONFIG instead of hardcoded gtk12-config/glib12-config
- Support CC/CFLAGS/PREIFX/LOCALBASE/X11BASE/MAKE/etc. properly

PR:		19623
Submitted by:	KATO Tsuguru <tkato@@prontomail.ne.jp>
@
text
@@


1.2
log
@Remove '-m486' and friends from CFLAGS so this builds on FreeBSD/Alpha.
@
text
@d1 2
a2 2
--- Makefile.orig	Sat Jul 24 15:33:08 1999
+++ Makefile	Sun Sep 19 13:48:47 1999
d13 2
a14 1
 DEBUG		= -g -DDEBUG
d17 1
a17 1
+CFLAGS		= -DNAME=\"$(NAME)\" $(DEBUG) -Wall -O2 -fno-strength-reduce -ffast-math -fexpensive-optimizations
d21 11
a31 1
@@@@ -28,10 +28,10 @@@@
d36 1
a36 1
+	$(CC) $(LDFLAGS) $(shell gtk12-config --libs) -o $@@ $(OBJS)
d40 1
a40 1
+	$(CC) $(CFLAGS) $(shell gtk12-config --cflags) -o $@@ -c $<
@


1.1
log
@Initial revision
@
text
@d1 3
a3 3
--- Makefile.orig	Sat Jul 31 17:03:44 1999
+++ Makefile	Sat Jul 31 17:04:37 1999
@@@@ -2,7 +2,7 @@@@
d12 8
@


1.1.1.1
log
@Renamed erwin to erwn to avoid copyright issues.
@
text
@@
