Created
December 29, 2013 04:50
-
-
Save zenhack/8167562 to your computer and use it in GitHub Desktop.
Untested changes to examples' makefiles.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/doc/EXAMPLE/EFFECTIVATS/DiningPhil/Makefile b/doc/EXAMPLE/EFFECTIVATS/DiningPhil/Makefile | |
| index 2950133..bb06eca 100644 | |
| --- a/doc/EXAMPLE/EFFECTIVATS/DiningPhil/Makefile | |
| +++ b/doc/EXAMPLE/EFFECTIVATS/DiningPhil/Makefile | |
| @@ -21,6 +21,10 @@ ATSCCFLAGS=-O2 | |
| # | |
| ###### | |
| +TARGET=test | |
| + | |
| +LDFLAGS=-lrt | |
| + | |
| SOURCES_SATS += \ | |
| DiningPhil.sats \ | |
| @@ -36,24 +40,6 @@ include $(PATSHOME)/share/atsmake-post.mk | |
| ###### | |
| -OBJECTS := $(TARGETS_DATS_O) | |
| - | |
| -###### | |
| - | |
| -all:: test | |
| -test: $(OBJECTS) ; \ | |
| - $(PATSCC) $(ATSCCFLAGS) -o $@ $^ -L$(PATSLIB) -lrt -latslib | |
| -cleanall:: ; $(RMF) test | |
| - | |
| -###### | |
| - | |
| -# | |
| -# You may find these rules useful | |
| -# | |
| - | |
| -%_sats.o: %.sats ; $(PATSCC) -DATS_MEMALLOC_LIBC -c $< || echo $@ ": ERROR!!!" | |
| -%_dats.o: %.dats ; $(PATSCC) -D_BSD_SOURCE -DATS_MEMALLOC_LIBC $(ATSCCFLAGS) -c $< || echo $@ ": ERROR!!!" | |
| - | |
| ###### | |
| upload_main: ; \ | |
| @@ -62,8 +48,4 @@ upload_main: ; \ | |
| ###### | |
| -clean:: cleanats | |
| - | |
| -###### | |
| - | |
| ###### end of [Makefile] ###### | |
| diff --git a/doc/EXAMPLE/EFFECTIVATS/DiningPhil2/Makefile b/doc/EXAMPLE/EFFECTIVATS/DiningPhil2/Makefile | |
| index 4aecafc..66e9fd6 100644 | |
| --- a/doc/EXAMPLE/EFFECTIVATS/DiningPhil2/Makefile | |
| +++ b/doc/EXAMPLE/EFFECTIVATS/DiningPhil2/Makefile | |
| @@ -21,6 +21,10 @@ ATSCCFLAGS=-O2 | |
| # | |
| ###### | |
| +TARGET=test | |
| + | |
| +LDFLAGS=-pthread | |
| + | |
| SOURCES_SATS += \ | |
| DiningPhil2.sats \ | |
| @@ -29,29 +33,10 @@ SOURCES_DATS += \ | |
| DiningPhil2_fork.dats \ | |
| DiningPhil2_thread.dats \ | |
| -###### | |
| - | |
| -include $(PATSHOME)/share/atsmake-post.mk | |
| - | |
| -###### | |
| - | |
| -OBJECTS := $(TARGETS_DATS_O) | |
| ###### | |
| -all:: test | |
| -test: $(OBJECTS) ; \ | |
| - $(PATSCC) $(ATSCCFLAGS) -pthread -o $@ $^ -L$(PATSLIB) -latslib | |
| -cleanall:: ; $(RMF) test | |
| - | |
| -###### | |
| - | |
| -# | |
| -# You may find these rules useful | |
| -# | |
| - | |
| -%_sats.o: %.sats ; $(PATSCC) -DATS_MEMALLOC_LIBC -c $< || echo $@ ": ERROR!!!" | |
| -%_dats.o: %.dats ; $(PATSCC) -D_BSD_SOURCE -DATS_MEMALLOC_LIBC $(ATSCCFLAGS) -c $< || echo $@ ": ERROR!!!" | |
| +include $(PATSHOME)/share/atsmake-post.mk | |
| ###### | |
| @@ -61,6 +46,4 @@ upload_main: ; \ | |
| ###### | |
| -clean:: cleanats | |
| - | |
| ###### end of [Makefile] ###### |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment