blob: f21c4c5e577a23269a478994ac7119d7945b98d4 (
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
|
diff -Naur electric-7.00/Makefile.in electric-7.00-new/Makefile.in
--- electric-7.00/Makefile.in 2004-07-15 20:59:50.000000000 -0500
+++ electric-7.00-new/Makefile.in 2006-03-15 22:19:08.000000000 -0600
@@ -1,10 +1,10 @@
########################################################## USING QT
##### If using Qt, uncomment these five lines
-# GRAPH_FLAGS = -DUSEQT -DQT_THREAD_SUPPORT -I$(QTDIR)/include $(QUI_CFLAGS)
-# GRAPH_LIBS = -L$(QTDIR)/lib $(QUI_LIBS) $(QT_LIB_EXTRAS)
-# GRAPH_OBJS = $(GRAPH_OBJS_QT)
-# GRAPH_SRC = $(GRAPH_SRC_QT)
-# CCOMPILER = @CXX@
+GRAPH_FLAGS = -DUSEQT -DQT_THREAD_SUPPORT -I$(QTDIR)/include $(QUI_CFLAGS)
+GRAPH_LIBS = -L$(QTDIR)/lib $(QUI_LIBS) $(QT_LIB_EXTRAS)
+GRAPH_OBJS = $(GRAPH_OBJS_QT)
+GRAPH_SRC = $(GRAPH_SRC_QT)
+CCOMPILER = @CXX@
##### Qt on UNIX/Linux: uncomment the next two lines:
ELECTRIC_TARGET = electric-target-unix
@@ -20,11 +20,11 @@
########################################################### USING MOTIF
##### If using Motif (or OpenMotif/Lesstif), uncomment these five lines
-GRAPH_FLAGS = @X_CFLAGS@
-GRAPH_LIBS = -lXm @XMULIB@ -lXt @XPLIB@ @XEXTLIB@ -lX11
-GRAPH_OBJS = $(GRAPH_OBJS_XT)
-GRAPH_SRC = $(GRAPH_SRC_XT)
-CCOMPILER = @PTHREAD_CC@
+#GRAPH_FLAGS = @X_CFLAGS@
+#GRAPH_LIBS = -lXm @XMULIB@ -lXt @XPLIB@ @XEXTLIB@ -lX11
+#GRAPH_OBJS = $(GRAPH_OBJS_XT)
+#GRAPH_SRC = $(GRAPH_SRC_XT)
+#CCOMPILER = @PTHREAD_CC@
##### For the general-purpose X facility, uncomment this line
XPOWER = -DANYDEPTH
@@ -997,9 +997,9 @@
src/graph/graphqtdlg.o: src/graph/graphqtdlg.cpp $(HDS)/global.h src/graph/graphqtdlg.h $(HDS)/edialogs.h
src/graph/graphqtdraw.o: src/graph/graphqtdraw.cpp $(HDS)/global.h src/graph/graphqt.h $(HDS)/egraphics.h
src/graph/moc_graphqt.cpp: src/graph/graphqt.h $(HDS)/global.h
- moc src/graph/graphqt.h -o $@
+ $(QTDIR)/bin/moc src/graph/graphqt.h -o $@
src/graph/moc_graphqtdlg.cpp: src/graph/graphqtdlg.h $(HDS)/global.h
- moc src/graph/graphqtdlg.h -o $@
+ $(QTDIR)/bin/moc src/graph/graphqtdlg.h -o $@
$(JARLOC): $(JAVA_OBJS)
(cd src/java; jar -cf ../../$(JARLOC) com/sun/dbmirror/*.class)
lib/java/romgen.class: lib/java/romgen.java
|
GitWeb
