Menu
▾
▴
make with no arguments does "make World" first time
|
From: <joh...@ve...> - 2000-02-17 18:06:33
|
Patch: vhclmaps-000217-johnston-008
For: vhclmaps-0.7.4
Author: joh...@us...
This is an intermediate patch to vhclmaps-0.7.4. To apply, cd to the
top-level directory of the vhclmaps source tree (the directory with src
and config subdirs), and apply like this:
patch -p0 <ThisFile
Summary of Changes:
- Now when you run "make" with no arguments, the first time through it
does the same thing as "make World", so everything gets built
automatically.
Index: top_vhclmaps/Imakefile
diff -c top_vhclmaps/Imakefile:1.1 top_vhclmaps/Imakefile:1.2
*** top_vhclmaps/Imakefile:1.1 Mon Aug 2 13:52:35 1999
--- ./Imakefile Thu Feb 17 21:56:46 2000
***************
*** 1,14 ****
XCOMM
! XCOMM "make CPU" prints the name you should assign to CPU.
! XCOMM "make World" builds everything.
XCOMM "make install" installs everything.
XCOMM
PACKAGE = top_vhclmaps
! WORLDOPTS = -k
SUBDIRS = src config
MakeCPU()
MakeWorld($(WORLDOPTS))
! MakeInSubdirs($(SUBDIRS))
--- 1,18 ----
XCOMM
! XCOMM "make CPU" prints the name used for machine-specific subdirectories
! XCOMM "make" builds everything.
XCOMM "make install" installs everything.
XCOMM
PACKAGE = top_vhclmaps
! WORLDOPTS =
SUBDIRS = src config
MakeCPU()
MakeWorld($(WORLDOPTS))
! MakeWorld2($(WORLDOPTS))
! MakeInSubdirsTop($(SUBDIRS))
!
! clean::
! @$(RM_CMD) make.makefile make.makefiles make.depend make.make
Index: Dlg/dlgfclass.c
diff -c Dlg/dlgfclass.c:1.1 Dlg/dlgfclass.c:1.2
*** Dlg/dlgfclass.c:1.1 Mon Aug 2 13:52:51 1999
--- src/Dlg/dlgfclass.c Thu Feb 17 21:56:49 2000
***************
*** 39,46 ****
#include <Unidraw/Graphic/graphic.h>
#include <Unidraw/Graphic/pspaint.h>
- #include <OS/math.h>
-
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
--- 39,44 ----
Index: MapUnidraw/geoloctool.c
diff -c MapUnidraw/geoloctool.c:1.1 MapUnidraw/geoloctool.c:1.2
*** MapUnidraw/geoloctool.c:1.1 Mon Aug 2 13:53:05 1999
--- src/MapUnidraw/geoloctool.c Thu Feb 17 21:56:52 2000
***************
*** 35,40 ****
--- 35,41 ----
#include <iostream.h>
#include <stdio.h>
+ #include <string.h>
/*****************************************************************************/
Index: VhclServ/vhclcomps.h
diff -c VhclServ/vhclcomps.h:1.2 VhclServ/vhclcomps.h:1.3
*** VhclServ/vhclcomps.h:1.2 Tue Jan 25 03:35:33 2000
--- src/VhclServ/vhclcomps.h Thu Feb 17 21:56:56 2000
***************
*** 54,60 ****
// void GrowParamList(ParamList*);
// static ParamList* _vehicle_params;
! classid("VhclServComp");
friend class VhclServUpdater;
};
--- 54,60 ----
// void GrowParamList(ParamList*);
// static ParamList* _vehicle_params;
! CLASS_SYMID("VhclServComp");
friend class VhclServUpdater;
};
***************
*** 77,83 ****
virtual void send_disconnect_commands(ostream&) = 0;
virtual void send_update_commands(ostream&) = 0;
! classid("VhclServUpdater");
protected:
char* _host;
--- 77,83 ----
virtual void send_disconnect_commands(ostream&) = 0;
virtual void send_update_commands(ostream&) = 0;
! CLASS_SYMID("VhclServUpdater");
protected:
char* _host;
***************
*** 142,148 ****
GpsdAcceptor* _gpsd_acceptor;
#endif
! classid("VehicleComp");
friend class VehicleUpdater;
};
--- 142,148 ----
GpsdAcceptor* _gpsd_acceptor;
#endif
! CLASS_SYMID("VehicleComp");
friend class VehicleUpdater;
};
***************
*** 161,167 ****
virtual void send_disconnect_commands(ostream&);
virtual void send_update_commands(ostream&);
! classid("VehicleUpdater");
};
--- 161,167 ----
virtual void send_disconnect_commands(ostream&);
virtual void send_update_commands(ostream&);
! CLASS_SYMID("VehicleUpdater");
};
***************
*** 185,191 ****
Route* _route;
! classid("RouteComp");
friend class RouteUpdater;
};
--- 185,191 ----
Route* _route;
! CLASS_SYMID("RouteComp");
friend class RouteUpdater;
};
***************
*** 203,209 ****
virtual void send_disconnect_commands(ostream&);
virtual void send_update_commands(ostream&);
! classid("RouteUpdater");
};
--- 203,209 ----
virtual void send_disconnect_commands(ostream&);
virtual void send_update_commands(ostream&);
! CLASS_SYMID("RouteUpdater");
};
Index: config_vhclmaps/rules.def
diff -c config_vhclmaps/rules.def:1.1 config_vhclmaps/rules.def:1.2
*** config_vhclmaps/rules.def:1.1 Mon Aug 2 13:53:59 1999
--- config/rules.def Thu Feb 17 21:56:58 2000
***************
*** 34,44 ****
@echo "" @@\
$(MAKE) Makefile CONFIGSRC=$(CONFIGSRC) XCONFIGDIR=$(XCONFIGDIR)@@\
@echo "" @@\
$(MAKE) Makefiles @@\
@echo "" @@\
$(MAKE) depend @@\
@echo "" @@\
! $(MAKE) flags all @@\
@echo "" @@\
@echo "$(RELEASE) build completed on `date`" @@\
@echo ""
--- 34,47 ----
@echo "" @@\
$(MAKE) Makefile CONFIGSRC=$(CONFIGSRC) XCONFIGDIR=$(XCONFIGDIR)@@\
@echo "" @@\
+ @echo "twice to propogate new toplevel pathname" @@\
+ $(MAKE) Makefile @@\
+ @echo "" @@\
$(MAKE) Makefiles @@\
@echo "" @@\
$(MAKE) depend @@\
@echo "" @@\
! $(MAKE) flags subdirs @@\
@echo "" @@\
@echo "$(RELEASE) build completed on `date`" @@\
@echo ""
***************
*** 79,84 ****
--- 82,119 ----
#endif
/*
+ * Make everything by default
+ */
+ #ifndef MakeWorld2
+ #define MakeWorld2(flags) @@\
+ all:: @@\
+ -@if [ ! -f make.makefile ]; then \ @@\
+ echo ""; \ @@\
+ echo "Building $(RELEASE) on `date`"; \ @@\
+ echo ""; \ @@\
+ $(MAKE) Makefile CONFIGSRC=$(CONFIGSRC) XCONFIGDIR=$(XCONFIGDIR);\@@\
+ echo "twice to propogate new toplevel pathname"; \ @@\
+ $(MAKE) Makefile; \ @@\
+ touch make.makefile; fi @@\
+ -@if [ ! -f make.makefiles ]; then \ @@\
+ echo ""; \ @@\
+ $(MAKE) Makefiles; \ @@\
+ touch make.makefiles; fi @@\
+ -@if [ ! -f make.depend ]; then \ @@\
+ echo ""; \ @@\
+ $(MAKE) depend; \ @@\
+ touch make.depend; fi @@\
+ -@if [ ! -f make.make ]; then \ @@\
+ echo ""; fi @@\
+ $(MAKE) flags subdirs @@\
+ -@if [ ! -f make.make ]; then \ @@\
+ echo ""; \ @@\
+ echo "$(RELEASE) build completed on `date`"; \ @@\
+ echo ""; \ @@\
+ touch make.make; fi
+ #endif
+
+ /*
* Make the Makefile in the current directory.
*/
#ifdef LinuxArchitecture
***************
*** 182,187 ****
--- 217,239 ----
done
#endif
+ /*
+ * Make the given target in the list of subdirectories.
+ */
+ #ifndef IntoSubdirs2
+ #define IntoSubdirs2(name,dirs,verb,target) @@\
+ target:: @@\
+ -@for i in dirs; \ @@\
+ do \ @@\
+ if [ -d $$i ]; then ( \ @@\
+ echo verb \ @@\
+ "for $(ARCH) in $(CURRENT_DIR)/$$i"; \ @@\
+ cd $$i; \ @@\
+ $(MAKE) $(PASSARCH) name; \ @@\
+ ) else continue; fi; \ @@\
+ done
+ #endif
+
#ifndef DependSubdirs
#define DependSubdirs(dirs) @@\
IntoSubdirs(depend,dirs,"depending")
***************
*** 192,197 ****
--- 244,254 ----
IntoSubdirs(all,dirs,"making all")
#endif
+ #ifndef MakeSubdirsTop
+ #define MakeSubdirsTop(dirs) @@\
+ IntoSubdirs2(all,dirs,"making all",subdirs)
+ #endif
+
#ifndef InstallSubdirs
#define InstallSubdirs(dirs) @@\
IntoSubdirs(install,dirs,"installing") @@\
***************
*** 279,285 ****
InstallSubdirs(dirs) @@\
CleanSubdirs(dirs) @@\
SpecialTargets(debug,-DUseDebug) @@\
- SpecialTargets(noshared,-DUseNonShared) @@\
IvmkcmTargets($(PACKAGE)) @@\
IvmkcmSubdirs(dirs)
#else
--- 336,341 ----
***************
*** 290,295 ****
--- 346,380 ----
InstallSubdirs(dirs) @@\
CleanSubdirs(dirs) @@\
SpecialTargets(debug,-DUseDebug) @@\
+ IvmkcmTargets($(PACKAGE)) @@\
+ IvmkcmSubdirs(dirs)
+ #endif
+ #endif
+
+ /*
+ * Version of MakeInSubdirs for the top-level without the MakeSubdirs
+ */
+ #ifndef MakeInSubdirsTop
+ #if HasDynamicSharedLibraries
+ #define MakeInSubdirsTop(dirs) @@\
+ MakefilesSubdirs(dirs) @@\
+ DependSubdirs(dirs) @@\
+ MakeSubdirsTop(dirs) @@\
+ InstallSubdirs(dirs) @@\
+ CleanSubdirs(dirs) @@\
+ SpecialTargets(debug,-DUseDebug) @@\
+ SpecialTargets(noshared,-DUseNonShared) @@\
+ IvmkcmTargets($(PACKAGE)) @@\
+ IvmkcmSubdirs(dirs)
+ #else
+ #define MakeInSubdirsTop(dirs) @@\
+ MakefilesSubdirs(dirs) @@\
+ DependSubdirs(dirs) @@\
+ MakeSubdirsTop(dirs) @@\
+ InstallSubdirs(dirs) @@\
+ CleanSubdirs(dirs) @@\
+ SpecialTargets(debug,-DUseDebug) @@\
+ SpecialTargets(noshared,-DUseNonShared) @@\
IvmkcmTargets($(PACKAGE)) @@\
IvmkcmSubdirs(dirs)
#endif
Index: vhclmaps_patches/vhclmaps-000210-johnston-007
*** /dev/null Thu Feb 17 21:57:02 PST 2000
--- patches/vhclmaps-000217-johnston-008
*************** patches/vhclmaps-000217-johnston-008
*** 0 ****
--- 1 ----
+ vhclmaps-000217-johnston-008
|
