diff --git a/Makefile b/Makefile index 9c985e58..dcc3d8c2 100644 --- a/Makefile +++ b/Makefile @@ -1,94 +1,24 @@ -CC = gcc -CFLAGS = -O2 -Wall -LFLAGS = +include Makefile.inc -all: dos33 asoft_detoken mkdos33fs make_b tokenize_asoft \ - dos33_text2ascii integer_detoken char2hex pcx2hgr \ - asoft_presenter shape_table asoft_compact +all: + cd asoft_basic-utils && make + cd asoft_presenter && make + cd dos33fs-utils && make + cd hgr-utils && make + +install: + cd asoft_basic-utils && make install + cd asoft_presenter && make install + cd dos33fs-utils && make install + cd hgr-utils && make install -asoft_compact: asoft_compact.o - $(CC) $(LFLAGS) -o asoft_compact asoft_compact.o - -asoft_compact.o: asoft_compact.c - $(CC) $(CFLAGS) -c asoft_compact.c - -asoft_detoken: asoft_detoken.o - $(CC) $(LFLAGS) -o asoft_detoken asoft_detoken.o - -asoft_detoken.o: asoft_detoken.c - $(CC) $(CFLAGS) -c asoft_detoken.c - -asoft_presenter: asoft_presenter.o - $(CC) $(LFLAGS) -o asoft_presenter asoft_presenter.o - -asoft_presenter.o: asoft_presenter.c - $(CC) $(CLFAGS) -c asoft_presenter.c - -integer_detoken: integer_detoken.o - $(CC) $(LFLAGS) -o integer_detoken integer_detoken.o - -integer_detoken.o: integer_detoken.c - $(CC) $(CFLAGS) -c integer_detoken.c - -shape_table: shape_table.o - $(CC) $(LFLAGS) -o shape_table shape_table.o - -shape_table.o: shape_table.c - $(CC) $(CFLAGS) -c shape_table.c - -tokenize_asoft: tokenize_asoft.o - $(CC) $(LFLAGS) -o tokenize_asoft tokenize_asoft.o - -tokenize_asoft.o: tokenize_asoft.c - $(CC) $(CFLAGS) -c tokenize_asoft.c - -pcx2hgr: pcx2hgr.o - $(CC) $(LFLAGS) -o pcx2hgr pcx2hgr.o - -pcx2hgr.o: pcx2hgr.c - $(CC) $(CFLAGS) -c pcx2hgr.c - -char2hex: char2hex.o - $(CC) $(LFLAGS) -o char2hex char2hex.o - -char2hex.o: char2hex.c - $(CC) $(CFLAGS) -c char2hex.c - -dos33: dos33.o - $(CC) $(LFLAGS) -o dos33 dos33.o - -dos33.o: dos33.c dos33.h - $(CC) $(CFLAGS) -c dos33.c - -dos33_text2ascii: dos33_text2ascii.o - $(CC) $(LFLGAS) -o dos33_text2ascii dos33_text2ascii.o - -dos33_text2ascii.o: dos33_text2ascii.c - $(CC) $(CFLAGS) -c dos33_text2ascii.c - -make_b: make_b.o - $(CC) $(LFLAGS) -o make_b make_b.o - -make_b.o: make_b.c - $(CC) $(CFLAGS) -c make_b.c - -mkdos33fs: mkdos33fs.o - $(CC) $(LFLAGS) -o mkdos33fs mkdos33fs.o - -mkdos33fs.o: mkdos33fs.c dos33.h - $(CC) $(CFLAGS) -c mkdos33fs.c +clean: + cd asoft_basic-utils && make clean + cd asoft_presenter && make clean + cd dos33fs-utils && make clean + cd hgr-utils && make clean + cd tests && make clean -install: - cp dos33 asoft_detoken mkdos33fs tokenize_asoft make_b \ - dos33_text2ascii integer_detoken /usr/local/bin - -clean: - rm -f *~ *.o asoft_detoken dos33 make_b mkdos33fs \ - tokenize_asoft dos33_text2ascii integer_detoken \ - char2hex pcx2hgr asoft_presenter shape_table \ - asoft_compact - cd tests && make clean - cd presenter_demo && make clean - +test: diff --git a/Makefile.inc b/Makefile.inc new file mode 100644 index 00000000..c6dcfe0c --- /dev/null +++ b/Makefile.inc @@ -0,0 +1,6 @@ +CC = gcc +CFLAGS = -O2 -Wall +LFLAGS = + +INSTALL_LOC = /usr/local/bin + diff --git a/asoft_basic-utils/Makefile b/asoft_basic-utils/Makefile new file mode 100644 index 00000000..a5f6bb85 --- /dev/null +++ b/asoft_basic-utils/Makefile @@ -0,0 +1,37 @@ +include ../Makefile.inc + +all: asoft_detoken tokenize_asoft integer_detoken asoft_compact + +asoft_compact: asoft_compact.o + $(CC) $(LFLAGS) -o asoft_compact asoft_compact.o + +asoft_compact.o: asoft_compact.c + $(CC) $(CFLAGS) -c asoft_compact.c + +asoft_detoken: asoft_detoken.o + $(CC) $(LFLAGS) -o asoft_detoken asoft_detoken.o + +asoft_detoken.o: asoft_detoken.c + $(CC) $(CFLAGS) -c asoft_detoken.c + +integer_detoken: integer_detoken.o + $(CC) $(LFLAGS) -o integer_detoken integer_detoken.o + +integer_detoken.o: integer_detoken.c + $(CC) $(CFLAGS) -c integer_detoken.c + +tokenize_asoft: tokenize_asoft.o + $(CC) $(LFLAGS) -o tokenize_asoft tokenize_asoft.o + +tokenize_asoft.o: tokenize_asoft.c + $(CC) $(CFLAGS) -c tokenize_asoft.c + + +install: + cp asoft_detoken tokenize_asoft integer_detoken $(INSTALL_LOC) + +clean: + rm -f *~ *.o asoft_detoken tokenize_asoft \ + integer_detoken asoft_compact + + diff --git a/asoft_compact.c b/asoft_basic-utils/asoft_compact.c similarity index 100% rename from asoft_compact.c rename to asoft_basic-utils/asoft_compact.c diff --git a/asoft_detoken.c b/asoft_basic-utils/asoft_detoken.c similarity index 100% rename from asoft_detoken.c rename to asoft_basic-utils/asoft_detoken.c diff --git a/integer_detoken.c b/asoft_basic-utils/integer_detoken.c similarity index 100% rename from integer_detoken.c rename to asoft_basic-utils/integer_detoken.c diff --git a/tokenize_asoft.c b/asoft_basic-utils/tokenize_asoft.c similarity index 100% rename from tokenize_asoft.c rename to asoft_basic-utils/tokenize_asoft.c diff --git a/version.h b/asoft_basic-utils/version.h similarity index 100% rename from version.h rename to asoft_basic-utils/version.h diff --git a/asoft_presenter/Makefile b/asoft_presenter/Makefile new file mode 100644 index 00000000..e9ba0a45 --- /dev/null +++ b/asoft_presenter/Makefile @@ -0,0 +1,20 @@ +include ../Makefile.inc + +all: asoft_presenter + + +asoft_presenter: asoft_presenter.o + $(CC) $(LFLAGS) -o asoft_presenter asoft_presenter.o + +asoft_presenter.o: asoft_presenter.c + $(CC) $(CLFAGS) -c asoft_presenter.c + + +install: + cp asoft_presenter $(INSTALL_LOC) + +clean: + rm -f *~ *.o asoft_presenter + + + diff --git a/README.presenter b/asoft_presenter/README.presenter similarity index 100% rename from README.presenter rename to asoft_presenter/README.presenter diff --git a/asoft_presenter.c b/asoft_presenter/asoft_presenter.c similarity index 100% rename from asoft_presenter.c rename to asoft_presenter/asoft_presenter.c diff --git a/presenter_demo/Makefile b/asoft_presenter/presenter_demo/Makefile similarity index 100% rename from presenter_demo/Makefile rename to asoft_presenter/presenter_demo/Makefile diff --git a/presenter_demo/footer b/asoft_presenter/presenter_demo/footer similarity index 100% rename from presenter_demo/footer rename to asoft_presenter/presenter_demo/footer diff --git a/presenter_demo/info b/asoft_presenter/presenter_demo/info similarity index 100% rename from presenter_demo/info rename to asoft_presenter/presenter_demo/info diff --git a/presenter_demo/load_demo.bas b/asoft_presenter/presenter_demo/load_demo.bas similarity index 100% rename from presenter_demo/load_demo.bas rename to asoft_presenter/presenter_demo/load_demo.bas diff --git a/presenter_demo/mkl_plasma_energy.pcx b/asoft_presenter/presenter_demo/mkl_plasma_energy.pcx similarity index 100% rename from presenter_demo/mkl_plasma_energy.pcx rename to asoft_presenter/presenter_demo/mkl_plasma_energy.pcx diff --git a/presenter_demo/mmm.bas b/asoft_presenter/presenter_demo/mmm.bas similarity index 100% rename from presenter_demo/mmm.bas rename to asoft_presenter/presenter_demo/mmm.bas diff --git a/presenter_demo/num.table b/asoft_presenter/presenter_demo/num.table similarity index 100% rename from presenter_demo/num.table rename to asoft_presenter/presenter_demo/num.table diff --git a/presenter_demo/plasma-dposv-power.pcx b/asoft_presenter/presenter_demo/plasma-dposv-power.pcx similarity index 100% rename from presenter_demo/plasma-dposv-power.pcx rename to asoft_presenter/presenter_demo/plasma-dposv-power.pcx diff --git a/presenter_demo/plasma_cholesky.pcx b/asoft_presenter/presenter_demo/plasma_cholesky.pcx similarity index 100% rename from presenter_demo/plasma_cholesky.pcx rename to asoft_presenter/presenter_demo/plasma_cholesky.pcx diff --git a/presenter_demo/presenter_demo.dsk b/asoft_presenter/presenter_demo/presenter_demo.dsk similarity index 100% rename from presenter_demo/presenter_demo.dsk rename to asoft_presenter/presenter_demo/presenter_demo.dsk diff --git a/presenter_demo/rapl_int_fp.pcx b/asoft_presenter/presenter_demo/rapl_int_fp.pcx similarity index 100% rename from presenter_demo/rapl_int_fp.pcx rename to asoft_presenter/presenter_demo/rapl_int_fp.pcx diff --git a/presenter_demo/rapl_micro.pcx b/asoft_presenter/presenter_demo/rapl_micro.pcx similarity index 100% rename from presenter_demo/rapl_micro.pcx rename to asoft_presenter/presenter_demo/rapl_micro.pcx diff --git a/presenter_demo/slide_01_intro b/asoft_presenter/presenter_demo/slide_01_intro similarity index 100% rename from presenter_demo/slide_01_intro rename to asoft_presenter/presenter_demo/slide_01_intro diff --git a/presenter_demo/slide_02_intro b/asoft_presenter/presenter_demo/slide_02_intro similarity index 100% rename from presenter_demo/slide_02_intro rename to asoft_presenter/presenter_demo/slide_02_intro diff --git a/presenter_demo/slide_03_piotr b/asoft_presenter/presenter_demo/slide_03_piotr similarity index 100% rename from presenter_demo/slide_03_piotr rename to asoft_presenter/presenter_demo/slide_03_piotr diff --git a/presenter_demo/slide_04_shortcomings b/asoft_presenter/presenter_demo/slide_04_shortcomings similarity index 100% rename from presenter_demo/slide_04_shortcomings rename to asoft_presenter/presenter_demo/slide_04_shortcomings diff --git a/presenter_demo/slide_05_papi b/asoft_presenter/presenter_demo/slide_05_papi similarity index 100% rename from presenter_demo/slide_05_papi rename to asoft_presenter/presenter_demo/slide_05_papi diff --git a/presenter_demo/slide_06_papi_benefits b/asoft_presenter/presenter_demo/slide_06_papi_benefits similarity index 100% rename from presenter_demo/slide_06_papi_benefits rename to asoft_presenter/presenter_demo/slide_06_papi_benefits diff --git a/presenter_demo/slide_07_current_components b/asoft_presenter/presenter_demo/slide_07_current_components similarity index 100% rename from presenter_demo/slide_07_current_components rename to asoft_presenter/presenter_demo/slide_07_current_components diff --git a/presenter_demo/slide_08_wattsup_pic b/asoft_presenter/presenter_demo/slide_08_wattsup_pic similarity index 100% rename from presenter_demo/slide_08_wattsup_pic rename to asoft_presenter/presenter_demo/slide_08_wattsup_pic diff --git a/presenter_demo/slide_09_wattsup b/asoft_presenter/presenter_demo/slide_09_wattsup similarity index 100% rename from presenter_demo/slide_09_wattsup rename to asoft_presenter/presenter_demo/slide_09_wattsup diff --git a/presenter_demo/slide_10_wattsup_plot b/asoft_presenter/presenter_demo/slide_10_wattsup_plot similarity index 100% rename from presenter_demo/slide_10_wattsup_plot rename to asoft_presenter/presenter_demo/slide_10_wattsup_plot diff --git a/presenter_demo/slide_11_rapl_intro b/asoft_presenter/presenter_demo/slide_11_rapl_intro similarity index 100% rename from presenter_demo/slide_11_rapl_intro rename to asoft_presenter/presenter_demo/slide_11_rapl_intro diff --git a/presenter_demo/slide_12_rapl_works b/asoft_presenter/presenter_demo/slide_12_rapl_works similarity index 100% rename from presenter_demo/slide_12_rapl_works rename to asoft_presenter/presenter_demo/slide_12_rapl_works diff --git a/presenter_demo/slide_13_rapl_more b/asoft_presenter/presenter_demo/slide_13_rapl_more similarity index 100% rename from presenter_demo/slide_13_rapl_more rename to asoft_presenter/presenter_demo/slide_13_rapl_more diff --git a/presenter_demo/slide_14_rapl_valid b/asoft_presenter/presenter_demo/slide_14_rapl_valid similarity index 100% rename from presenter_demo/slide_14_rapl_valid rename to asoft_presenter/presenter_demo/slide_14_rapl_valid diff --git a/presenter_demo/slide_15_rapl_accuracy b/asoft_presenter/presenter_demo/slide_15_rapl_accuracy similarity index 100% rename from presenter_demo/slide_15_rapl_accuracy rename to asoft_presenter/presenter_demo/slide_15_rapl_accuracy diff --git a/presenter_demo/slide_16_rapl_papi b/asoft_presenter/presenter_demo/slide_16_rapl_papi similarity index 100% rename from presenter_demo/slide_16_rapl_papi rename to asoft_presenter/presenter_demo/slide_16_rapl_papi diff --git a/presenter_demo/slide_17_rapl_power b/asoft_presenter/presenter_demo/slide_17_rapl_power similarity index 100% rename from presenter_demo/slide_17_rapl_power rename to asoft_presenter/presenter_demo/slide_17_rapl_power diff --git a/presenter_demo/slide_18_rapl_energy b/asoft_presenter/presenter_demo/slide_18_rapl_energy similarity index 100% rename from presenter_demo/slide_18_rapl_energy rename to asoft_presenter/presenter_demo/slide_18_rapl_energy diff --git a/presenter_demo/slide_19_nvml b/asoft_presenter/presenter_demo/slide_19_nvml similarity index 100% rename from presenter_demo/slide_19_nvml rename to asoft_presenter/presenter_demo/slide_19_nvml diff --git a/presenter_demo/slide_20_nvml_plot b/asoft_presenter/presenter_demo/slide_20_nvml_plot similarity index 100% rename from presenter_demo/slide_20_nvml_plot rename to asoft_presenter/presenter_demo/slide_20_nvml_plot diff --git a/presenter_demo/slide_21_future_papi b/asoft_presenter/presenter_demo/slide_21_future_papi similarity index 100% rename from presenter_demo/slide_21_future_papi rename to asoft_presenter/presenter_demo/slide_21_future_papi diff --git a/presenter_demo/slide_22_amd b/asoft_presenter/presenter_demo/slide_22_amd similarity index 100% rename from presenter_demo/slide_22_amd rename to asoft_presenter/presenter_demo/slide_22_amd diff --git a/presenter_demo/slide_23_powermon b/asoft_presenter/presenter_demo/slide_23_powermon similarity index 100% rename from presenter_demo/slide_23_powermon rename to asoft_presenter/presenter_demo/slide_23_powermon diff --git a/presenter_demo/slide_24_user b/asoft_presenter/presenter_demo/slide_24_user similarity index 100% rename from presenter_demo/slide_24_user rename to asoft_presenter/presenter_demo/slide_24_user diff --git a/presenter_demo/slide_25_measuring b/asoft_presenter/presenter_demo/slide_25_measuring similarity index 100% rename from presenter_demo/slide_25_measuring rename to asoft_presenter/presenter_demo/slide_25_measuring diff --git a/presenter_demo/slide_26_events b/asoft_presenter/presenter_demo/slide_26_events similarity index 100% rename from presenter_demo/slide_26_events rename to asoft_presenter/presenter_demo/slide_26_events diff --git a/presenter_demo/slide_27_multiple b/asoft_presenter/presenter_demo/slide_27_multiple similarity index 100% rename from presenter_demo/slide_27_multiple rename to asoft_presenter/presenter_demo/slide_27_multiple diff --git a/presenter_demo/slide_28_questions b/asoft_presenter/presenter_demo/slide_28_questions similarity index 100% rename from presenter_demo/slide_28_questions rename to asoft_presenter/presenter_demo/slide_28_questions diff --git a/presenter_demo/slide_29_appleIIe b/asoft_presenter/presenter_demo/slide_29_appleIIe similarity index 100% rename from presenter_demo/slide_29_appleIIe rename to asoft_presenter/presenter_demo/slide_29_appleIIe diff --git a/presenter_demo/slide_30_linpack b/asoft_presenter/presenter_demo/slide_30_linpack similarity index 100% rename from presenter_demo/slide_30_linpack rename to asoft_presenter/presenter_demo/slide_30_linpack diff --git a/presenter_demo/slide_31_questions b/asoft_presenter/presenter_demo/slide_31_questions similarity index 100% rename from presenter_demo/slide_31_questions rename to asoft_presenter/presenter_demo/slide_31_questions diff --git a/presenter_demo/slide_title b/asoft_presenter/presenter_demo/slide_title similarity index 100% rename from presenter_demo/slide_title rename to asoft_presenter/presenter_demo/slide_title diff --git a/presenter_demo/title.pcx b/asoft_presenter/presenter_demo/title.pcx similarity index 100% rename from presenter_demo/title.pcx rename to asoft_presenter/presenter_demo/title.pcx diff --git a/presenter_demo/wattsup.pcx b/asoft_presenter/presenter_demo/wattsup.pcx similarity index 100% rename from presenter_demo/wattsup.pcx rename to asoft_presenter/presenter_demo/wattsup.pcx diff --git a/dos33fs-utils/Makefile b/dos33fs-utils/Makefile new file mode 100644 index 00000000..3f60b0ee --- /dev/null +++ b/dos33fs-utils/Makefile @@ -0,0 +1,42 @@ +include ../Makefile.inc + +all: dos33 mkdos33fs make_b \ + dos33_text2ascii char2hex + + +char2hex: char2hex.o + $(CC) $(LFLAGS) -o char2hex char2hex.o + +char2hex.o: char2hex.c + $(CC) $(CFLAGS) -c char2hex.c + +dos33: dos33.o + $(CC) $(LFLAGS) -o dos33 dos33.o + +dos33.o: dos33.c dos33.h + $(CC) $(CFLAGS) -c dos33.c + +dos33_text2ascii: dos33_text2ascii.o + $(CC) $(LFLGAS) -o dos33_text2ascii dos33_text2ascii.o + +dos33_text2ascii.o: dos33_text2ascii.c + $(CC) $(CFLAGS) -c dos33_text2ascii.c + +make_b: make_b.o + $(CC) $(LFLAGS) -o make_b make_b.o + +make_b.o: make_b.c + $(CC) $(CFLAGS) -c make_b.c + +mkdos33fs: mkdos33fs.o + $(CC) $(LFLAGS) -o mkdos33fs mkdos33fs.o + +mkdos33fs.o: mkdos33fs.c dos33.h + $(CC) $(CFLAGS) -c mkdos33fs.c + + +install: + cp dos33 mkdos33fs make_b dos33_text2ascii char2hex $(INSTALL_LOC) + +clean: + rm -f *~ *.o dos33 mkdos33fs make_b dos33_text2ascii char2hex diff --git a/char2hex.c b/dos33fs-utils/char2hex.c similarity index 100% rename from char2hex.c rename to dos33fs-utils/char2hex.c diff --git a/dos33.c b/dos33fs-utils/dos33.c similarity index 100% rename from dos33.c rename to dos33fs-utils/dos33.c diff --git a/dos33.h b/dos33fs-utils/dos33.h similarity index 100% rename from dos33.h rename to dos33fs-utils/dos33.h diff --git a/dos33_text2ascii.c b/dos33fs-utils/dos33_text2ascii.c similarity index 100% rename from dos33_text2ascii.c rename to dos33fs-utils/dos33_text2ascii.c diff --git a/make_b.c b/dos33fs-utils/make_b.c similarity index 100% rename from make_b.c rename to dos33fs-utils/make_b.c diff --git a/mkdos33fs.c b/dos33fs-utils/mkdos33fs.c similarity index 100% rename from mkdos33fs.c rename to dos33fs-utils/mkdos33fs.c diff --git a/dos33fs-utils/version.h b/dos33fs-utils/version.h new file mode 100644 index 00000000..4ede9c6e --- /dev/null +++ b/dos33fs-utils/version.h @@ -0,0 +1 @@ +#define VERSION "0.0.10" diff --git a/hgr-utils/Makefile b/hgr-utils/Makefile new file mode 100644 index 00000000..57c4664a --- /dev/null +++ b/hgr-utils/Makefile @@ -0,0 +1,25 @@ +include ../Makefile.inc + +all: pcx2hgr shape_table + + +shape_table: shape_table.o + $(CC) $(LFLAGS) -o shape_table shape_table.o + +shape_table.o: shape_table.c + $(CC) $(CFLAGS) -c shape_table.c + +pcx2hgr: pcx2hgr.o + $(CC) $(LFLAGS) -o pcx2hgr pcx2hgr.o + +pcx2hgr.o: pcx2hgr.c + $(CC) $(CFLAGS) -c pcx2hgr.c + + +install: + cp pcx2hgr shape_table $(INSTALL_LOC) + +clean: + rm -f *~ *.o pcx2hgr shape_table + + diff --git a/hgr.pal b/hgr-utils/hgr.pal similarity index 100% rename from hgr.pal rename to hgr-utils/hgr.pal diff --git a/pcx2hgr.c b/hgr-utils/pcx2hgr.c similarity index 100% rename from pcx2hgr.c rename to hgr-utils/pcx2hgr.c diff --git a/shape_table.c b/hgr-utils/shape_table.c similarity index 100% rename from shape_table.c rename to hgr-utils/shape_table.c