* [gentoo-commits] gentoo-x86 commit in sci-visualization/spectromatic/files: spectromatic-1.0-makefile.patch
@ 2008-11-26 10:48 Sebastien Fabbro (bicatali)
0 siblings, 0 replies; 2+ messages in thread
From: Sebastien Fabbro (bicatali) @ 2008-11-26 10:48 UTC (permalink / raw
To: gentoo-commits
bicatali 08/11/26 10:48:58
Added: spectromatic-1.0-makefile.patch
Log:
Fix installation for man files, cleaned ebuild and propagate cflags
(Portage version: 2.2_rc15/cvs/Linux 2.6.25-gentoo-r7 x86_64)
Revision Changes Path
1.1 sci-visualization/spectromatic/files/spectromatic-1.0-makefile.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/spectromatic/files/spectromatic-1.0-makefile.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/spectromatic/files/spectromatic-1.0-makefile.patch?rev=1.1&content-type=text/plain
Index: spectromatic-1.0-makefile.patch
===================================================================
--- spectromatic-1.0/Makefile 2002-03-30 05:17:34.000000000 +0000
+++ spectromatic-1.0.new/Makefile 2008-11-26 10:43:15.910065276 +0000
@@ -1,33 +1,29 @@
# Makefile for spectromatic
-CFLAGS = -O2 -Wall
LIBS = -lgsl -lgslcblas -lpng -lm
DESTDIR =
TOPLEVEL_HOME = /usr
-CC = gcc -I.
-
SRC = spectromatic.c wave.c
OBJ = $(SRC:.c=.o)
TARGET = spectromatic
-install: all
- mkdir -p $(DESTDIR)$(TOPLEVEL_HOME)/bin
- mkdir -p $(DESTDIR)$(TOPLEVEL_HOME)/man/man1
- install -o root -g root -m 0755 spectromatic $(DESTDIR)$(TOPLEVEL_HOME)/bin
- install -o root -g root -m 0644 man/spectromatic.1 $(DESTDIR)$(TOPLEVEL_HOME)/man/man1
-
all: $(OBJ)
$(CC) -o $(TARGET) $(OBJ) $(LIBS)
- strip $(TARGET)
+
+install: all
+ mkdir -p $(DESTDIR)$(TOPLEVEL_HOME)/bin
+ mkdir -p $(DESTDIR)$(TOPLEVEL_HOME)/share/man/man1
+ install -m 0755 spectromatic $(DESTDIR)$(TOPLEVEL_HOME)/bin
+ install -m 0644 man/spectromatic.1 $(DESTDIR)$(TOPLEVEL_HOME)/share/man/man1
clean:
$(RM) $(TARGET) $(OBJ)
.c.o:
- $(CC) $(CFLAGS) -c $<
+ $(CC) $(CFLAGS) -I. -c $<
.o:
$(CC) $< $(LIBS) -o $@
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-visualization/spectromatic/files: spectromatic-1.0-makefile.patch
@ 2010-08-27 7:21 Kacper Kowalik (xarthisius)
0 siblings, 0 replies; 2+ messages in thread
From: Kacper Kowalik (xarthisius) @ 2010-08-27 7:21 UTC (permalink / raw
To: gentoo-commits
xarthisius 10/08/27 07:21:50
Modified: spectromatic-1.0-makefile.patch
Log:
Respect CC and LDFLAGS wrt bug 334715. Thanks to Diego for the report. Clean ebuild.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.2 sci-visualization/spectromatic/files/spectromatic-1.0-makefile.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/spectromatic/files/spectromatic-1.0-makefile.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/spectromatic/files/spectromatic-1.0-makefile.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/spectromatic/files/spectromatic-1.0-makefile.patch?r1=1.1&r2=1.2
Index: spectromatic-1.0-makefile.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/spectromatic/files/spectromatic-1.0-makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- spectromatic-1.0-makefile.patch 26 Nov 2008 10:48:58 -0000 1.1
+++ spectromatic-1.0-makefile.patch 27 Aug 2010 07:21:50 -0000 1.2
@@ -1,10 +1,14 @@
---- spectromatic-1.0/Makefile 2002-03-30 05:17:34.000000000 +0000
-+++ spectromatic-1.0.new/Makefile 2008-11-26 10:43:15.910065276 +0000
+Respect LDFLAGS, CFLAGS, CC #334715
+Fix install paths
+
+--- Makefile
++++ Makefile
@@ -1,33 +1,29 @@
# Makefile for spectromatic
-CFLAGS = -O2 -Wall
- LIBS = -lgsl -lgslcblas -lpng -lm
+-LIBS = -lgsl -lgslcblas -lpng -lm
++LIBS = -lpng `pkg-config --libs gsl`
DESTDIR =
TOPLEVEL_HOME = /usr
@@ -23,10 +27,11 @@
- install -o root -g root -m 0644 man/spectromatic.1 $(DESTDIR)$(TOPLEVEL_HOME)/man/man1
-
all: $(OBJ)
- $(CC) -o $(TARGET) $(OBJ) $(LIBS)
+- $(CC) -o $(TARGET) $(OBJ) $(LIBS)
- strip $(TARGET)
++ $(CC) $(LDFLAGS) -o $(TARGET) $(OBJ) $(LIBS)
+
-+install: all
++install: $(TARGET)
+ mkdir -p $(DESTDIR)$(TOPLEVEL_HOME)/bin
+ mkdir -p $(DESTDIR)$(TOPLEVEL_HOME)/share/man/man1
+ install -m 0755 spectromatic $(DESTDIR)$(TOPLEVEL_HOME)/bin
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-08-27 7:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-11-26 10:48 [gentoo-commits] gentoo-x86 commit in sci-visualization/spectromatic/files: spectromatic-1.0-makefile.patch Sebastien Fabbro (bicatali)
-- strict thread matches above, loose matches on Subject: below --
2010-08-27 7:21 Kacper Kowalik (xarthisius)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox