cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

respect CC/CXX/CFLAGS/CXXFLAGS, ok maintainer

Browse Source
This commit is contained in:
wilfried 2001-03-16 18:06:44 +00:00
parent 47cc6c1a38
commit 6ea033da47
1 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
devel/lincvs/patches/patch-Makefile
View File

@ -1,6 +1,6 @@
--- Makefile.orig Fri Dec 3 16:45:01 1999
+++ Makefile Sun Dec 3 23:07:17 2000
@@ -7,15 +7,15 @@
+++ Makefile Fri Mar 16 16:16:40 2001
@@ -7,15 +7,14 @@
####### Compiler, tools and options
@ -12,16 +12,39 @@
-LINK = g++
+#CC = gcc
+#CXX = g++
+CFLAGS+= -Wall -W -O2 -D_REENTRANT -DLINCVS_APP -DNO_DEBUG
+CXXFLAGS= -Wall -W -D_REENTRANT -DLINCVS_APP -DNO_DEBUG
+INCPATH = -I./include -I./res -I./themes/include -I./themes/res -I${PREFIX}/include/X11/qt2
+DEFS = -D_REENTRANT -DLINCVS_APP -DNO_DEBUG
+INCPATH = -I./include -I./res -I./themes/include -I./themes/res -I${LOCALBASE}/include/X11/qt2
+LINK = $(CXX)
LFLAGS =
-LIBS = -L$(QTDIR)/lib -lqt -L/usr/X11R6/lib -lXext -lX11 -lm
-MOC = moc
+LIBS = -L$(PREFIX)/lib/qt2 -L${PREFIX}/lib -L${X11BASE}/lib -lqt -lXext -lX11 -lm
+MOC = $(PREFIX)/bin/moc2
+LIBS = -L$(LOCALBASE)/lib/qt2 -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt -lXext -lX11 -lm
+MOC = $(LOCALBASE)/bin/moc2
TAR = tar -cf
GZIP = gzip -9f
@@ -69,19 +68,19 @@ TARGET = LinCVS
.SUFFIXES: .cpp .cxx .cc .C .c
.cpp.o:
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+ $(CXX) -c $(CXXFLAGS) ${DEFS} $(INCPATH) -o $@ $<
.cxx.o:
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+ $(CXX) -c $(CXXFLAGS) ${DEFS} $(INCPATH) -o $@ $<
.cc.o:
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+ $(CXX) -c $(CXXFLAGS) ${DEFS} $(INCPATH) -o $@ $<
.C.o:
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+ $(CXX) -c $(CXXFLAGS) ${DEFS} $(INCPATH) -o $@ $<
.c.o:
- $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
+ $(CC) -c $(CFLAGS) ${DEFS} $(INCPATH) -o $@ $<
####### Build rules