1999-08-18 01:01:45 +00:00
|
|
|
--- Makefile.orig Tue Mar 16 09:14:22 1999
|
|
|
|
|
+++ Makefile Tue Aug 17 16:15:41 1999
|
|
|
|
|
@@ -1,14 +1,15 @@
|
|
|
|
|
-INCLUDE = -I$(QTDIR)/include -I. -I$(HOME)/include -I./icons
|
|
|
|
|
-DESTLIB = $(HOME)/lib # where to put library
|
|
|
|
|
-LIB = -L/usr/X11R6/lib -L$(QTDIR)/lib -L$(DESTLIB)
|
|
|
|
|
+QTDIR = ${X11BASE}
|
|
|
|
|
+INCLUDE = -I$(QTDIR)/include -I ${QTDIR}/include/X11/qt -I. -I$(HOME)/include -I./icons
|
|
|
|
|
+DESTLIB = ${PREFIX}/lib
|
|
|
|
|
+LIB = -L${LOCALBASE}/lib -L$(QTDIR)/lib -L$(DESTLIB) -L.
|
|
|
|
|
|
|
|
|
|
MOC = $(QTDIR)/bin/moc
|
|
|
|
|
-CC = g++
|
|
|
|
|
-C = gcc
|
|
|
|
|
+#CC = ${CX
|
|
|
|
|
+#CXX = ${CXX}
|
|
|
|
|
AR = ar
|
|
|
|
|
M = moc_
|
|
|
|
|
|
|
|
|
|
-OPTIONS = -g -ansi -fguiding-decls
|
1999-08-26 00:55:17 +00:00
|
|
|
+OPTIONS = ${CFLAGS} -fguiding-decls -DFINEDIR=\""${PREFIX}/share/fine\""
|
1999-08-18 01:01:45 +00:00
|
|
|
|
|
|
|
|
OBJ = qsmartedit.o qcolormultilinedit.o undoredo.o qeditor.o qfontselect.o qcolordialog.o qcolorlistboxitem.o qkeyworddialog.o qhotkeydialog.o
|
|
|
|
|
METAOBJ = qsmartedit.mo qcolormultilinedit.mo qeditor.mo qfontselect.mo qcolordialog.mo qkeyworddialog.mo qhotkeydialog.mo
|
|
|
|
|
@@ -27,14 +28,13 @@
|
|
|
|
|
|
|
|
|
|
$(TARGET): $(OBJ) $(METAOBJ)
|
|
|
|
|
$(AR) r $(TARGET) $(OBJ) $(METAOBJ)
|
|
|
|
|
- mv $(TARGET) $(DESTLIB)
|
|
|
|
|
|
|
|
|
|
%.o: %.C
|
|
|
|
|
- $(CC) -c $(OPTIONS) $(INCLUDE) $<
|
|
|
|
|
+ $(CXX) -c $(OPTIONS) $(INCLUDE) $<
|
|
|
|
|
|
|
|
|
|
%.mo: %.h
|
|
|
|
|
$(MOC) $< -o $(subst .h,.C,m$<)
|
|
|
|
|
- $(CC) -c $(OPTIONS) $(INCLUDE) $(subst .h,.C,m$<) -o $(subst .h,.mo,$<)
|
|
|
|
|
+ $(CXX) -c $(OPTIONS) $(INCLUDE) $(subst .h,.C,m$<) -o $(subst .h,.mo,$<)
|
|
|
|
|
|
|
|
|
|
fine: fine.o fine.mo
|
|
|
|
|
- $(CC) -g -ofine fine.o fine.mo $(OPTIONS) $(LIB) -lFine -lqt -lX11 -lXext
|
1999-09-08 23:38:55 +00:00
|
|
|
+ $(CXX) -g -ofine fine.o fine.mo $(OPTIONS) $(LIB) -lFine -lqt -lX11 -lXext
|
