Skip to content

Commit

Permalink
Merge pull request #365 from mgroeber9110/master
Browse files Browse the repository at this point in the history
Miscellaneous fixes to makedpnd and other build tools
  • Loading branch information
bluewaysw authored Jan 2, 2024
2 parents 36fb625 + 6cd136a commit 06b7820
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 392 deletions.
2 changes: 1 addition & 1 deletion Include/Win32/geode.mk
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,7 @@ $(DEPFILE) : $(SRCS) $(GPFILE)
#endif
## -del $(.TARGET:X\\[*\\].*).BAK
## -copy $(.TARGET) $(.TARGET:X\\[*\\].*).BAK
$(MAKEDPND) $(ROOT_DIR) $(DEVEL_DIR) $(INSTALL_DIR) -o$(.TARGET:S|DEPENDENCIES.MK|dependencies.mk|) `$(PRODUCT_FLAGS) goc $(PRODUCT)` $(CMODULES) ENDCMODULES $(MODULES) ENDASMMODULES $(GOCDEPENDS) $(CDEPENDS) $(ASMDEPENDS) $(SRCS:M*.GOC) $(SRCS:M*.goc) $(SRCS:M*.C) $(SRCS:M*.c) $(UI_TO_RDFS) $(ASM_TO_OBJS) ENDFILES
$(MAKEDPND) $(ROOT_DIR) $(DEVEL_DIR) $(INSTALL_DIR) -o$(.TARGET:S|DEPENDENCIES.MK|dependencies.mk|) `$(PRODUCT_FLAGS) goc $(PRODUCT)` $(CMODULES) ENDCMODULES $(MODULES) ENDASMMODULES $(GOCDEPENDS) $(CDEPENDS) $(ASMDEPENDS) $(SRCS:M*.[gG][oO][cC]) $(SRCS:M*.[cC]) $(UI_TO_RDFS) $(ASM_TO_OBJS) ENDFILES
#if exists($(.ALLSRC:M*.gp))
findlbdr $(.ALLSRC:M*.gp) $(.TARGET) $(GEODES)
#elif exists($(.ALLSRC:M*.GP))
Expand Down
2 changes: 1 addition & 1 deletion Installed/Appl/Breadbox/BbxBrow/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ SRCS = $(JS) $(URLFRAME) $(URLTEXT) $(ASMTOOLS) $(INIT)\
$(COMMON)
LOBJS =

PRODUCTS = AB JSAB
PRODUCTS =

SYSMAKEFILE = geode.mk

Expand Down
6 changes: 3 additions & 3 deletions Installed/Tools/pmake/makedpnd/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@ DEFTARGET = linux
DEFTARGET = win32
#endif

MISRCS = fileargs.c makedpnd.c
MISRCS = makedpnd.c

win32SRCS = $(MISRCS) win32.md/
win32OBJS = win32.md/fileargs.obj win32.md/makedpnd.obj
win32OBJS = win32.md/makedpnd.obj
win32LIBS =

linuxSRCS = $(MISRCS) linux.md/
linuxOBJS = linux.md/fileargs.o linux.md/makedpnd.o
linuxOBJS = linux.md/makedpnd.o
linuxLIBS =

SUBDIRS =
Expand Down
4 changes: 2 additions & 2 deletions TechDocs/Markdown/Tools/ttools.md
Original file line number Diff line number Diff line change
Expand Up @@ -1633,7 +1633,7 @@ Any line may be continued over multiple lines by ending it with a backslash
following line are compressed into a single space before the input line is
examined by pmake.

#####10.13.4.1 Dependency Lines
##### 10.13.4.1 Dependency Lines

In any system, there are dependencies between the files that make up the
system. For instance, in a program made up of several C source files and one
Expand Down Expand Up @@ -2465,7 +2465,7 @@ by the shell, where * means zero or more characters of any sort;
that is one of "a", "b", "c" or "d" (there may be any number of
characters between the brackets); [0-9] matches any single
character that is between "0" and "9" (i.e. any digit. This form
may be freely mixed with the other bracket form), and `\' is
may be freely mixed with the other bracket form), and `\\' is
used to escape any of the characters "*", "?", "[" or ":", leaving
them as regular characters to match themselves in a word.

Expand Down
335 changes: 0 additions & 335 deletions Tools/pmake/makedpnd/fileargs.c

This file was deleted.

Loading

0 comments on commit 06b7820

Please sign in to comment.