1999-02-20 00:57:14 +00:00
|
|
|
*** Makefile~ Sun Nov 30 20:46:24 1997
|
|
|
|
|
--- Makefile Mon Feb 15 21:44:29 1999
|
1997-12-03 00:31:43 +00:00
|
|
|
***************
|
1999-02-20 00:57:14 +00:00
|
|
|
*** 11,22 ****
|
1997-12-03 00:31:43 +00:00
|
|
|
HAVE_KDE=1
|
|
|
|
|
|
|
|
|
|
! QTDIR = /usr/lib/qt
|
|
|
|
|
! X11DIR = /usr/X11
|
|
|
|
|
|
|
|
|
|
# Needed only if you have KDE, otherwise leave it alone
|
|
|
|
|
! KDEDIR = /opt/kde
|
|
|
|
|
|
|
|
|
|
# Uncomment, if you need debug info in the prog.
|
1999-02-20 00:57:14 +00:00
|
|
|
! DEBUG_FL = -g
|
|
|
|
|
|
|
|
|
|
# Binaries
|
|
|
|
|
--- 11,22 ----
|
1997-12-03 00:31:43 +00:00
|
|
|
HAVE_KDE=1
|
|
|
|
|
|
|
|
|
|
! QTDIR = $(X11BASE)
|
|
|
|
|
! X11DIR = $(X11BASE)
|
|
|
|
|
|
|
|
|
|
# Needed only if you have KDE, otherwise leave it alone
|
|
|
|
|
! KDEDIR = $(PREFIX)
|
|
|
|
|
|
|
|
|
|
# Uncomment, if you need debug info in the prog.
|
1999-02-20 00:57:14 +00:00
|
|
|
! #DEBUG_FL = -g
|
|
|
|
|
|
|
|
|
|
# Binaries
|
1997-12-03 00:31:43 +00:00
|
|
|
***************
|
|
|
|
|
*** 24,28 ****
|
|
|
|
|
SHELL = /bin/sh
|
|
|
|
|
CC = gcc
|
|
|
|
|
! MOC = /usr/bin/moc
|
|
|
|
|
install = /usr/bin/install -c
|
|
|
|
|
|
|
|
|
|
--- 24,28 ----
|
|
|
|
|
SHELL = /bin/sh
|
|
|
|
|
CC = gcc
|
|
|
|
|
! MOC = $(X11BASE)/bin/moc
|
|
|
|
|
install = /usr/bin/install -c
|
|
|
|
|
|
|
|
|
|
***************
|
|
|
|
|
*** 31,35 ****
|
|
|
|
|
X11LIBDIR = $(X11DIR)/lib
|
|
|
|
|
X11INCDIR = $(X11DIR)/include
|
|
|
|
|
! QTINCDIR = $(QTDIR)/include
|
|
|
|
|
QTLIBDIR = $(QTDIR)/lib
|
|
|
|
|
KDEINCDIR = $(KDEDIR)/include
|
|
|
|
|
--- 31,35 ----
|
|
|
|
|
X11LIBDIR = $(X11DIR)/lib
|
|
|
|
|
X11INCDIR = $(X11DIR)/include
|
|
|
|
|
! QTINCDIR = $(QTDIR)/include/X11/qt
|
|
|
|
|
QTLIBDIR = $(QTDIR)/lib
|
|
|
|
|
KDEINCDIR = $(KDEDIR)/include
|
|
|
|
|
***************
|
1999-02-20 00:57:14 +00:00
|
|
|
*** 43,74 ****
|
1997-12-03 00:31:43 +00:00
|
|
|
INSTALL_DIR_PRIVATE = $(install) -d -m 0700
|
|
|
|
|
|
|
|
|
|
- ifdef HAVE_KDE
|
|
|
|
|
BINDIR = $(KDEDIR)/bin
|
|
|
|
|
DATADIR = $(KDEDIR)/share/apps/ktamaga
|
|
|
|
|
HELPDIR = $(KDEDIR)/share/doc/HTML/default/ktamaga
|
|
|
|
|
- else
|
|
|
|
|
-
|
|
|
|
|
- # If you compile the X11-only (non-KDE) version see these:
|
|
|
|
|
- BINDIR = /usr/X11/bin
|
|
|
|
|
- # the DATADIR is still hardcoded in tamaga.h, so take care if you change it
|
|
|
|
|
- DATADIR = /usr/lib/X11/tamaga
|
|
|
|
|
- HELPDIR = /usr/doc/tamaga
|
|
|
|
|
- endif
|
|
|
|
|
|
|
|
|
|
###########################################################
|
|
|
|
|
|
|
|
|
|
- ifdef HAVE_KDE
|
|
|
|
|
KINC = -I $(KDEINCDIR)
|
|
|
|
|
KLIB = -L $(KDELIBDIR) -lkdecore -lkdeui -lXext
|
|
|
|
|
KDEF = -DUSEKDE
|
|
|
|
|
- endif
|
|
|
|
|
|
|
|
|
|
INCLUDES = -I $(QTINCDIR) -I $(X11INCDIR) $(KINC)
|
1999-02-20 00:57:14 +00:00
|
|
|
! LIBS = -L $(X11LIBDIR) $(KLIB) -lqt -lm
|
|
|
|
|
DEFINES = -DSTDC_HEADERS $(KDEF)
|
|
|
|
|
#DEFINES = -DHAVE_CONFIG_H $(KDEF)
|
1997-12-03 00:31:43 +00:00
|
|
|
# maybe -DSTDC_HEADERS needed instead of -DHAVE_CONFIG_H
|
|
|
|
|
|
|
|
|
|
! CFLAGS = $(DEBUG_FL) -O2 -fno-strength-reduce -Wall -W $(INCLUDES) $(DEFINES)
|
|
|
|
|
LFLAGS = $(DEBUG_FL) $(LIBS)
|
|
|
|
|
|
1999-02-20 00:57:14 +00:00
|
|
|
--- 43,63 ----
|
|
|
|
|
INSTALL_DIR_PRIVATE = $(install) -d -m 0700
|
|
|
|
|
|
|
|
|
|
BINDIR = $(KDEDIR)/bin
|
|
|
|
|
DATADIR = $(KDEDIR)/share/apps/ktamaga
|
|
|
|
|
HELPDIR = $(KDEDIR)/share/doc/HTML/default/ktamaga
|
|
|
|
|
|
|
|
|
|
###########################################################
|
|
|
|
|
|
|
|
|
|
KINC = -I $(KDEINCDIR)
|
|
|
|
|
KLIB = -L $(KDELIBDIR) -lkdecore -lkdeui -lXext
|
|
|
|
|
KDEF = -DUSEKDE
|
|
|
|
|
|
|
|
|
|
INCLUDES = -I $(QTINCDIR) -I $(X11INCDIR) $(KINC)
|
|
|
|
|
! LIBS = -L $(X11LIBDIR) $(KLIB) -lqt -lm -lstdc++
|
|
|
|
|
DEFINES = -DSTDC_HEADERS $(KDEF)
|
|
|
|
|
#DEFINES = -DHAVE_CONFIG_H $(KDEF)
|
1997-12-03 00:31:43 +00:00
|
|
|
# maybe -DSTDC_HEADERS needed instead of -DHAVE_CONFIG_H
|
|
|
|
|
|
1999-02-20 00:57:14 +00:00
|
|
|
! CFLAGS = $(DEBUG_FL) $(INCLUDES) $(DEFINES) -DX11BASE=\"$(X11BASE)\" -DKDEDIR=\"$(KDEDIR)\"
|
1997-12-03 00:31:43 +00:00
|
|
|
LFLAGS = $(DEBUG_FL) $(LIBS)
|
|
|
|
|
|
|
|
|
|
***************
|
|
|
|
|
*** 84,92 ****
|
|
|
|
|
SRCMETA = mlwin.cpp mconf.cpp mconfData.cpp mtlcd.cpp
|
|
|
|
|
OBJMETA = mlwin.o mconf.o mconfData.o mtlcd.o
|
|
|
|
|
- ifdef HAVE_KDE
|
|
|
|
|
TARGET = ktamaga
|
|
|
|
|
- else
|
|
|
|
|
- TARGET = xtamaga
|
|
|
|
|
- endif
|
|
|
|
|
|
|
|
|
|
####### Implicit rules
|
|
|
|
|
--- 73,77 ----
|
|
|
|
|
***************
|
|
|
|
|
*** 122,134 ****
|
|
|
|
|
|
|
|
|
|
install: $(TARGET)
|
|
|
|
|
- ifdef HAVE_KDE
|
|
|
|
|
@echo "--------------------------------------------"
|
|
|
|
|
@echo " Installing KTamaga, for KDE"
|
|
|
|
|
@echo "--------------------------------------------"
|
|
|
|
|
- else
|
|
|
|
|
- @echo "--------------------------------------------"
|
|
|
|
|
- @echo " Installing xTamaga, fot X-Win"
|
|
|
|
|
- @echo "--------------------------------------------"
|
|
|
|
|
- endif
|
|
|
|
|
$(INSTALL_DIR) $(BINDIR)
|
|
|
|
|
$(INSTALL) $(TARGET) $(BINDIR)
|
|
|
|
|
--- 107,113 ----
|
|
|
|
|
***************
|
|
|
|
|
*** 137,141 ****
|
|
|
|
|
$(INSTALL_DATA) HTMLdoc/* $(HELPDIR)
|
|
|
|
|
|
|
|
|
|
- ifdef HAVE_KDE
|
|
|
|
|
$(INSTALL_DIR) $(KDEDIR)/share/applnk/Games
|
|
|
|
|
$(INSTALL_DATA) KTamaga.kdelnk $(KDEDIR)/share/applnk/Games
|
|
|
|
|
--- 116,119 ----
|
|
|
|
|
***************
|
|
|
|
|
*** 143,147 ****
|
|
|
|
|
$(INSTALL_DIR) $(KDEDIR)/share/icons
|
|
|
|
|
$(INSTALL_DATA) ktamaga.xpm $(KDEDIR)/share/icons
|
|
|
|
|
- endif
|
|
|
|
|
|
|
|
|
|
$(INSTALL_DIR) $(DATADIR)
|
|
|
|
|
--- 121,124 ----
|
