Changeset 11292 for trunk/gsdl

Timestamp:

2006-02-27T17:54:12+13:00 (18 years ago)

Author:

jrm21

Message:

use configure's OBJEXT variable instead of working around ansi vs kr c
problems.

Location:

trunk/gsdl/packages/mg

Files:

• lib/Makefile.in (modified) (3 diffs)
• src/text/Makefile.in (modified) (6 diffs)

trunk/gsdl/packages/mg/lib/Makefile.in

@@ -37 +37 @@
 DEFS = @DEFS@
 RANLIB = @RANLIB@
+OBJEXT = @OBJEXT@
 
 ##########################################
@@ -56 +57 @@
     $(COMPILE) $<
 
-ANSI2KNR = @ANSI2KNR@
-o = .@U@o
- 
-.SUFFIXES: ._c ._o
-.c._c:
-    ./ansi2knr $< > $*.tmp && mv $*.tmp $@
-._c._o:
-    @echo $(COMPILE) $<
-    @rm -f _$*.c
-    @ln $< _$*.c && $(COMPILE) _$*.c && mv _$*.o $@ && rm _$*.c
-.c._o:
-    ./ansi2knr $< > $*.tmp && mv $*.tmp $*._c
-    @echo $(COMPILE) $*._c
-    @rm -f _$*.c
-    @ln $*._c _$*.c && $(COMPILE) _$*.c && mv _$*.o $@ && rm _$*.c
-
- 
 INCLUDES = -I../../.. -I.. -I$(srcdir)
  
@@ -100 +84 @@
 
 OBJECTS = @ALLOCA@ @LIBOBJS@ \
-    bitio_random$o    mgheap$o            memlib$o \
-    bitio_stdio$o     huffman$o         messages$o \
-    bitio_gen$o       filestats$o       huffman_mem$o     perf_hash$o \
-    bitio_mem$o       getopt$o          huffman_stdio$o   sptree$o \
-    bitio_mems$o      getopt1$o         local_strings$o   lovinstem$o \
-    timing$o \
-    error$o           xmalloc$o \
-    random$o          simplefrenchstem$o \
-    unitool$o
-#   gmalloc$o regex$o       rx$o 
+    bitio_random.$(OBJEXT)    mgheap.$(OBJEXT)            memlib.$(OBJEXT) \
+    bitio_stdio.$(OBJEXT)     huffman.$(OBJEXT)         messages.$(OBJEXT) \
+    bitio_gen.$(OBJEXT)       filestats.$(OBJEXT)       huffman_mem.$(OBJEXT)     perf_hash.$(OBJEXT) \
+    bitio_mem.$(OBJEXT)       getopt.$(OBJEXT)          huffman_stdio.$(OBJEXT)   sptree.$(OBJEXT) \
+    bitio_mems.$(OBJEXT)      getopt1.$(OBJEXT)         local_strings.$(OBJEXT)   lovinstem.$(OBJEXT) \
+    timing.$(OBJEXT) \
+    error.$(OBJEXT)           xmalloc.$(OBJEXT) \
+    random.$(OBJEXT)          simplefrenchstem.$(OBJEXT) \
+    unitool.$(OBJEXT)
+#   gmalloc.$(OBJEXT) regex.$(OBJEXT)       rx.$(OBJEXT) 
 
 LIB_OBJECTS =   \
-    bitio_random$o    mgheap$o            memlib$o \
-    bitio_stdio$o     huffman$o          \
-    bitio_gen$o       filestats$o       huffman_mem$o     perf_hash$o \
-    bitio_mem$o       getopt$o          huffman_stdio$o   sptree$o \
-    bitio_mems$o      getopt1$o         local_strings$o   lovinstem$o \
-    timing$o \
-    error$o           xmalloc$o \
-    random$o          simplefrenchstem$o \
-    unitool$o
+    bitio_random.$(OBJEXT)    mgheap.$(OBJEXT)            memlib.$(OBJEXT) \
+    bitio_stdio.$(OBJEXT)     huffman.$(OBJEXT)          \
+    bitio_gen.$(OBJEXT)       filestats.$(OBJEXT)       huffman_mem.$(OBJEXT)     perf_hash.$(OBJEXT) \
+    bitio_mem.$(OBJEXT)       getopt.$(OBJEXT)          huffman_stdio.$(OBJEXT)   sptree.$(OBJEXT) \
+    bitio_mems.$(OBJEXT)      getopt1.$(OBJEXT)         local_strings.$(OBJEXT)   lovinstem.$(OBJEXT) \
+    timing.$(OBJEXT) \
+    error.$(OBJEXT)           xmalloc.$(OBJEXT) \
+    random.$(OBJEXT)          simplefrenchstem.$(OBJEXT) \
+    unitool.$(OBJEXT)
 
 

trunk/gsdl/packages/mg/src/text/Makefile.in

@@ -32 +32 @@
 subdir = src/text
 top_srcdir = @top_srcdir@
-transform = @program_transform_name@
  
 AR = ar
@@ -57 +56 @@
 ##########################################
 
- 
-bindir = ../../../../bin/$(GSDLOS)
+libdir = @libdir@/gsdl
+# greenstone's binaries go into its libdir (although should probably be
+# libexecdir, really) - jrm Dec 2005
+bindir = $(libdir)/$(GSDLOS)
 datadir = $(prefix)/share
 libexecdir = $(exec_prefix)/libexec
 localedir = $(datadir)/locale
-mandir = $(prefix)/man/man1
  
 COMPILE = $(CC) -c $(DEFS) $(TREC_MODE) $(READLINE) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
@@ -73 +73 @@
  
 
-ANSI2KNR = @ANSI2KNR@
-o = .@U@o
- 
-.SUFFIXES: ._c ._o
-.c._c:
-    ./ansi2knr $< > $*.tmp && mv $*.tmp $@
-._c._o:
-    @echo $(COMPILE) $<
-    @rm -f _$*.c
-    @ln $< _$*.c && $(COMPILE) _$*.c && mv _$*.o $@ && rm _$*.c
-.c._o:
-    ./ansi2knr $< > $*.tmp && mv $*.tmp $*._c
-    @echo $(COMPILE) $*._c
-    @rm -f _$*.c
-    @ln $*._c _$*.c && $(COMPILE) _$*.c && mv _$*.o $@ && rm _$*.c
+o = .@OBJEXT@
  
 INCLUDES = -I../../../.. -I../.. -I../../lib -I.
@@ -312 +298 @@
     $(LINK) ansi2knr.o $(LIBS)
 
-install: execinstall #maninstall
-uninstall: execuninstall manuninstall
-
-execinstall: $(EXEC)
+install:
     for name in $(EXEC); do \
       $(INSTALL_PROGRAM) $$name \
-      $(bindir)/`echo $$name | sed '$(transform)'`; \
+      $(bindir)/$$name; \
     done
 
-execuninstall:
+uninstall:
     for name in $(EXEC); do \
-     rm -f $(bindir)/`echo $$name | sed '$(transform)'`; \
-    done
-
-maninstall: $(MAN)
-    $(top_srcdir)/mkinstalldirs $(mandir); \
-    for f in $(MAN); do \
-      $(INSTALL_DATA) $$f $(mandir)/$$f ;\
-    done
-
-manuninstall: $(MAN)
-    for f in $(MAN); do \
-      rm -f $(mandir)/$$f ;\
+     rm -f $(bindir)/$$name; \
     done
 
@@ -352 +324 @@
     $(RANLIB) libtextin.a
 
-mostlyclean:
+clean: 
     rm -f *$o _*.c _*.o *._c *._o core core.*
- 
-clean: mostlyclean
     rm -f $(EXEC) libtextin.a
  
@@ -361 +331 @@
     rm -f ansi2knr
     rm -f Makefile
- 
-maintainer-clean: distclean
-    @echo "This command is intended only for maintainers to use;"
-    @echo "rebuilding the deleted files may require special tools."
- 
-dist: $(DISTFILES)
-    for file in $(DISTFILES); do \
-      ln $(srcdir)/$$file $(distdir) 2> /dev/null \
-      || cp -p $(srcdir)/$$file $(distdir); \
-    done
- 
-# This screws up distclean, and isn't needed as configure makes the
-# Makefile. (jrm21)
-#Makefile: Makefile.in ../../../../config.status
-#   cd ../../../.. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
- 
-# Tell versions [3.59,3.63) of GNU make not to export all variables.
-# Otherwise a system limit (for SysV at least) may be exc
-
-
-
-
-
-