Changeset 1518


Ignore:
Timestamp:
2000-09-07T16:34:21+12:00 (24 years ago)
Author:
jrm21
Message:

Edited various Makefile.in files so that "make distclean" works properly.

Location:
trunk/gsdl
Files:
9 edited

Legend:

Unmodified
Added
Removed

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

    r1348 r1518  
    7070clean: clean-recursive clean-local
    7171
    72 distclean: distclean-recursive distclean-local
    73     rm -f config.status
     72# the toplevel Makefile already does our subdirs.
     73#distclean: distclean-recursive distclean-local
     74#   rm -f config.status
     75distclean:
    7476
    7577maintainer-clean: maintainer-clean-recursive maintainer-clean-local

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

    r1325 r1518  
    167167    @echo "rebuilding the deleted files may require special tools."
    168168
    169 Makefile: Makefile.in ../../../config.status
    170     cd ../../.. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
     169#Makefile: Makefile.in ../../../config.status
     170#   cd ../../.. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
    171171 
    172172# Tell versions [3.59,3.63) of GNU make not to export all variables.

  • trunk/gsdl/packages/mg/src/images/Makefile.in

    r702 r1518  
    208208      || cp -p $(srcdir)/$$file $(distdir); \
    209209    done
    210  
    211 Makefile: Makefile.in ../../../../config.status
    212     cd ../../../.. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
     210
     211# screws up distclean (jrm21)
     212#Makefile: Makefile.in ../../../../config.status
     213#   cd ../../../.. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
    213214 
    214215# Tell versions [3.59,3.63) of GNU make not to export all variables.

  • trunk/gsdl/packages/mg/src/scripts/Makefile.in

    r702 r1518  
    143143      || cp -p $(srcdir)/$$file $(distdir); \
    144144    done
    145  
    146 Makefile: Makefile.in ../../../../config.status
    147     cd ../../../.. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
     145
     146# screws up distclean (jrm21)
     147#Makefile: Makefile.in ../../../../config.status
     148#   cd ../../../.. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
    148149 
    149150# Tell versions [3.59,3.63) of GNU make not to export all variables.

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

    r1326 r1518  
    372372    done
    373373 
    374 Makefile: Makefile.in ../../../../config.status
    375     cd ../../../.. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
     374# This screws up distclean, and isn't needed as configure makes the
     375# Makefile. (jrm21)
     376#Makefile: Makefile.in ../../../../config.status
     377#   cd ../../../.. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
    376378 
    377379# Tell versions [3.59,3.63) of GNU make not to export all variables.

  • trunk/gsdl/src/mgpp/Makefile.in

    r1340 r1518  
    5252.SUFFIXES:
    5353
    54 all install uninstall execinstall execuninstall maninstall manuninstall: config.h
     54all install uninstall execinstall execuninstall maninstall manuninstall:
     55#config.h
    5556    for subdir in $(SUBDIRS); do \
    5657      echo making $@ in $$subdir; \
    … …  
    6667clean: clean-recursive clean-local
    6768
    68 distclean: distclean-recursive distclean-local
    69     rm config.status
     69# toplevel Makefile does our subdirs already (jrm21)
     70#distclean: distclean-recursive distclean-local
     71#   rm config.status
     72distclean:
    7073
    7174maintainer-clean: maintainer-clean-recursive maintainer-clean-local

  • trunk/gsdl/src/mgpp/lib/Makefile.in

    r1344 r1518  
    7575    @ln $*._c _$*.c && $(COMPILE) _$*.c && mv _$*.o $@ && rm _$*.c
    7676
    77  
    78 INCLUDES = -I.. -I$(srcdir)
     77# want toplevel config.h, not local one
     78INCLUDES = -I../../.. -I$(srcdir)
    7979 
    8080HEADERS = \
    … …  
    121121    $(RANLIB) libmg.a
    122122
    123 $(OBJECTS): ../config.h
     123$(OBJECTS): ../../../config.h
    124124
    125125install:
    … …  
    150150    @echo "rebuilding the deleted files may require special tools."
    151151
    152 Makefile: Makefile.in ../../../config.status
    153     cd ../../.. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
     152# breaks make distclean (jrm21)
     153#Makefile: Makefile.in ../../../config.status
     154#   cd ../../.. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
    154155 
    155156# Tell versions [3.59,3.63) of GNU make not to export all variables.

  • trunk/gsdl/src/mgpp/text/Makefile.in

    r1344 r1518  
    9494    @ln $*._c _$*.c && $(COMPILE) _$*.c && mv _$*.o $@ && rm _$*.c
    9595
    96 INCLUDES = -I../ -I../lib -I.
     96# want toplevel config.h, not local mg one
     97INCLUDES = -I../../.. -I../lib -I.
    9798
    9899#############################################################################
    … …  
    307308        done
    308309
    309 Makefile: Makefile.in ../../../config.status
    310     cd ../../.. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
     310# jrm21
     311#Makefile: Makefile.in ../../../config.status
     312#   cd ../../.. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
    311313
    312314# Tell versions [3.59,3.63) of GNU make not to export all variables.

  • trunk/gsdl/src/recpt/Makefile.in

    r1494 r1518  
    172172distclean:
    173173    rm -f $(OBJECTS) $(EXEC) $(PARSE_TMPFILES) Makefile
     174    (cd $(YAZDIR) && make distclean)
    174175
    175176clean:
    176177    rm -f $(OBJECTS) $(EXEC) $(PARSE_TMPFILES)
     178    (cd $(YAZDIR) && make clean)
    177179
    178180install:
Note: See TracChangeset for help on using the changeset viewer.