19 Dec
2001
19 Dec
'01
7:42 p.m.
Frank Heckenbach wrote:
Maurice Lombardi wrote: Did you confuse the file names? What you sent is the same diff25 you sent last time (resolution in imgviever).
Indeed it was diff26 (attached now)
BTW (I don't care much myself, just curious): How about building, say Linux console and X11? Shouldn't they use different libsubdirs also?
Not necessary bacause the library names are different: libgrx20 libgrx20X
BTW, some other files (fnt2c, bin2c, xmodetest in bin) are also not deleted with clean. Is this intentional, or should I add them to the clean rules?
Probably not intentional. Just do it.
Maurice
--
Maurice Lombardi
Laboratoire de Spectrometrie Physique,
Universite Joseph Fourier de Grenoble, BP87
38402 Saint Martin d'Heres Cedex FRANCE
Tel: 33 (0)4 76 51 47 51
Fax: 33 (0)4 76 63 54 95
mailto:Maurice.Lombardi@ujf-grenoble.fr
--- pascal/bgi/makefile.dj2.orig Sun Oct 7 01:27:54 2001
+++ pascal/bgi/makefile.dj2 Wed Dec 19 16:08:46 2001
@@ -9,24 +9,11 @@
include ../../makedefs.grx
+UNITPATH = --unit-path=..
GRXLIB = ../../lib/$(GRX_LIB_SUBDIR)/libgrx20.a
GRXLIBPATH = -L../../lib/$(GRX_LIB_SUBDIR)
-ADDON_LIBS=
-
-ifeq ($(HAVE_LIBTIFF),y)
- ADDON_LIBS += -ltiff
-endif
-
-ifeq ($(HAVE_LIBJPEG),y)
- ADDON_LIBS += -ljpeg
-endif
-
-ifeq ($(NEED_ZLIB),y)
- ADDON_LIBS += -lz
-endif
-
-LIBS= $(GRXLIBPATH) $(ADDON_LIBS)
+LIBS= $(GRXLIBPATH) $(GRXLIB)
# Compiler and options on your system
COMPILER = gpc --automake
@@ -42,7 +29,7 @@
all: $(PROGS)
$(PROGS): %.exe : %.pas $(GRXLIB)
- $(COMPILER) $(CCOPT) -o $*.exe $*.pas $(LIBS)
+ $(COMPILER) $(CCOPT) -o $*.exe $*.pas $(UNITPATH) $(LIBS)
clean:
if exist *.o del *.o
--- pascal/bgi/makefile.w32.orig Sun Oct 7 01:27:54 2001
+++ pascal/bgi/makefile.w32 Wed Dec 19 16:08:46 2001
@@ -13,20 +13,7 @@
GRXLIB = ../../lib/$(GRX_LIB_SUBDIR)/libgrx20.a
GRXLIBPATH = -L../../lib/$(GRX_LIB_SUBDIR)
-ADDON_LIBS=
-ifeq ($(HAVE_LIBTIFF),y)
- ADDON_LIBS += -ltiff
-endif
-
-ifeq ($(HAVE_LIBJPEG),y)
- ADDON_LIBS += -ljpeg
-endif
-
-ifeq ($(NEED_ZLIB),y)
- ADDON_LIBS += -lz
-endif
-
-LIBS= $(GRXLIBPATH) $(ADDON_LIBS) -mwindows -mconsole
+LIBS= $(GRXLIBPATH) $(GRXLIB) -mwindows -mconsole
# Compiler and options on your system
COMPILER = gpc --autobuild --gpc-main=GRXMain
--- pascal/bgi/makefile.x11.orig Sun Oct 7 01:27:54 2001
+++ pascal/bgi/makefile.x11 Wed Dec 19 16:08:46 2001
@@ -8,24 +8,11 @@
include ../../makedefs.grx
+UNITPATH = --unit-path=..
GRXLIB = ../../lib/$(GRX_LIB_SUBDIR)/libgrx20X.a
GRXLIBPATH = -L../../lib/$(GRX_LIB_SUBDIR)
-ADDON_LIBS=
-
-ifeq ($(HAVE_LIBTIFF),y)
- ADDON_LIBS += -ltiff
-endif
-
-ifeq ($(HAVE_LIBJPEG),y)
- ADDON_LIBS += -ljpeg
-endif
-
-ifeq ($(NEED_ZLIB),y)
- ADDON_LIBS += -lz
-endif
-
-LIBS= $(GRXLIBPATH) $(ADDON_LIBS) $(X11LIBS) -lm
+LIBS= $(GRXLIBPATH) $(GRXLIB) $(X11LIBS) -lm
# Compiler and options on your system
COMPILER = gpc --automake
@@ -41,7 +28,7 @@
all: $(PROGS)
$(PROGS): x% : %.pas $(GRXLIB)
- $(COMPILER) $(CCOPT) -o $@ $*.pas $(LIBS)
+ $(COMPILER) $(CCOPT) -o $@ $*.pas $(UNITPATH) $(LIBS)
clean:
rm -f *.o *.gpi *.gpm $(PROGS)
--- pascal/bgi/makefile.lnx.orig Sun Oct 7 01:27:54 2001
+++ pascal/bgi/makefile.lnx Wed Dec 19 16:08:46 2001
@@ -8,24 +8,11 @@
include ../../makedefs.grx
+UNITPATH = --unit-path=..
GRXLIB = ../../lib/$(GRX_LIB_SUBDIR)/libgrx20.a
GRXLIBPATH = -L../../lib/$(GRX_LIB_SUBDIR)
-ADDON_LIBS= -lvga
-
-ifeq ($(HAVE_LIBTIFF),y)
- ADDON_LIBS += -ltiff
-endif
-
-ifeq ($(HAVE_LIBJPEG),y)
- ADDON_LIBS += -ljpeg
-endif
-
-ifeq ($(NEED_ZLIB),y)
- ADDON_LIBS += -lz
-endif
-
-LIBS= $(GRXLIBPATH) $(ADDON_LIBS) -lm
+LIBS= $(GRXLIBPATH) $(GRXLIB) -lvga -lm
# Compiler and options on your system
COMPILER = gpc --automake
@@ -41,7 +28,7 @@
all: $(PROGS)
$(PROGS): % : %.pas $(GRXLIB)
- $(COMPILER) $(CCOPT) -o $* $*.pas $(LIBS)
+ $(COMPILER) $(CCOPT) -o $* $*.pas $(UNITPATH) $(LIBS)
clean:
rm -f *.o *.gpi *.gpm $(PROGS)