blob: bc6cc180d36914b04b103b4c19bb5b38d395e990 (
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
47
48
49
50
51
52
|
$NetBSD: patch-ae,v 1.2 2000/12/05 18:32:05 drochner Exp $
--- src/Makefile.in.orig Wed Nov 8 18:06:56 2000
+++ src/Makefile.in Thu Nov 30 13:15:27 2000
@@ -2,7 +2,7 @@
####### Compiler, tools and options
-CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
+CXX = $(SYSCONF_CXX_LIB) $(QT_CXX_MT)
CXXFLAGS= $(SYSCONF_CXXFLAGS_OPENGL) $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS_X11) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) $(QT_CXXFLAGS_OPT)
CC = $(SYSCONF_CC) $(QT_C_MT)
CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) $(QT_CFLAGS_OPT)
@@ -14,7 +14,7 @@
####### Target
-DESTDIR = ../lib/
+DESTDIR =
VER_MAJ = 2
VER_MIN = 2
VER_PATCH = 2
@@ -370,19 +370,7 @@
.SUFFIXES: .cpp .cxx .cc .C .c
.cpp.o:
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
- $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
+ @cd `dirname $@` && $(CXX) -c $(CXXFLAGS) `basename $<`
####### Build rules
@@ -390,7 +378,7 @@
all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
- $(SYSCONF_LINK_LIB)
+ $(SYSCONF_LINK_LIB) $(SYSCONF_RPATH_X11) $(SYSCONF_RPATH_OPENGL)
moc: $(SRCMOC)
|
