From 5dd3c3e64a9574112dda77a5afc167f5daa53fd8 Mon Sep 17 00:00:00 2001 From: Nathan Wagner Date: Fri, 15 Feb 2019 10:44:42 +0000 Subject: [PATCH] move C source files into src --- Makefile | 46 +++++++++++++----------- zpm-add.c => src/add.c | 0 zpm-addfile.c => src/addfile.c | 0 zpm-extract.c => src/extract.c | 0 zpm-fetchurl.c => src/fetchurl.c | 0 zpm-findpkg.c => src/findpkg.c | 0 zpm-foreach-path.c => src/foreach-path.c | 0 zpm-hash.c => src/hash.c | 0 zpm-init.c => src/init.c | 0 zpm-note.c => src/note.c | 0 zpm-packagehash.c => src/packagehash.c | 0 zpm-parse.c => src/parse.c | 0 zpm-quote.c => src/quote.c | 0 zpm-script.c => src/script.c | 0 zpm-search.c => src/search.c | 0 zpm-stat.c => src/stat.c | 0 zpm-syncfs.c => src/syncfs.c | 0 zpm-vercmp.c => src/vercmp.c | 0 zpm-verify.c => src/verify.c | 0 19 files changed, 25 insertions(+), 21 deletions(-) rename zpm-add.c => src/add.c (100%) rename zpm-addfile.c => src/addfile.c (100%) rename zpm-extract.c => src/extract.c (100%) rename zpm-fetchurl.c => src/fetchurl.c (100%) rename zpm-findpkg.c => src/findpkg.c (100%) rename zpm-foreach-path.c => src/foreach-path.c (100%) rename zpm-hash.c => src/hash.c (100%) rename zpm-init.c => src/init.c (100%) rename zpm-note.c => src/note.c (100%) rename zpm-packagehash.c => src/packagehash.c (100%) rename zpm-parse.c => src/parse.c (100%) rename zpm-quote.c => src/quote.c (100%) rename zpm-script.c => src/script.c (100%) rename zpm-search.c => src/search.c (100%) rename zpm-stat.c => src/stat.c (100%) rename zpm-syncfs.c => src/syncfs.c (100%) rename zpm-vercmp.c => src/vercmp.c (100%) rename zpm-verify.c => src/verify.c (100%) diff --git a/Makefile b/Makefile index 1f3ea83..5acbbbd 100644 --- a/Makefile +++ b/Makefile @@ -119,52 +119,55 @@ zpm-soname: elf/soname.o zpm-soneed: elf/needed.o $(CC) $(CFLAGS) -Ielf $(LDFLAGS) -o $@ $+ -zpm-addfile: zpm-addfile.o libzpm.a libelf.a +zpm-addfile: src/addfile.o libzpm.a libelf.a $(CC) -Ielf $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf -zpm-hash: zpm-hash.o libzpm.a - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf +zpm-hash: src/hash.o libzpm.a + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -zpm-verify: zpm-verify.o t/ctap/ctap.o libzpm.a +zpm-verify: src/verify.o t/ctap/ctap.o libzpm.a $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< t/ctap/ctap.o -lzpm -lelf -zpm-init: zpm-init.o libzpm.a +zpm-init: src/init.o libzpm.a $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf -zpm-extract: zpm-extract.o libzpm.a +zpm-stat: src/stat.o + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< + +zpm-extract: src/extract.o libzpm.a $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf -zpm-script: zpm-script.o libzpm.a +zpm-script: src/script.o libzpm.a $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf -zpm-packagehash: zpm-packagehash.o libzpm.a +zpm-packagehash: src/packagehash.o libzpm.a $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf -zpm-foreach-path.o: CFLAGS+=-Wno-unused-parameter -zpm-script.o: CFLAGS+=-Wno-unused-parameter +src/foreach-path.o: CFLAGS+=-Wno-unused-parameter +src/script.o: CFLAGS+=-Wno-unused-parameter -zpm-foreach-path: zpm-foreach-path.o libzpm.a sqlite/sqlite3.h +zpm-foreach-path: src/foreach-path.o libzpm.a sqlite/sqlite3.h $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf -zpm-findpkg: zpm-findpkg.o libzpm.a +zpm-findpkg: src/findpkg.o libzpm.a $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf -zpm-search: zpm-search.o libzpm.a +zpm-search: src/search.o libzpm.a $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf -zpm-note: zpm-note.o libzpm.a +zpm-note: src/note.o libzpm.a $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf -zpm-syncfs: zpm-syncfs.o libzpm.a libelf.a +zpm-syncfs: src/syncfs.o libzpm.a libelf.a $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf -lm -zpm-parse: zpm-parse.o lib/parse.o +zpm-parse: src/parse.o lib/parse.o $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+ -zpm-add: zpm-add.o libzpm.a libelf.a +zpm-add: src/add.o libzpm.a libelf.a $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf -zpm-quote: zpm-quote.o +zpm-quote: src/quote.o $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< db.sql: schema/main.sql schema/syncconflicts.sql schema/syncinfo.sql schema/preserve_packages.sql schema/age.sql @@ -191,7 +194,7 @@ sqlite/shell.o: sqlite/shell.c sqlite/config.h Makefile lib/zpm.o: newdb.c -zpm-vercmp: zpm-vercmp.o lib/vercmp.o +zpm-vercmp: src/vercmp.o lib/vercmp.o $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+ zpm-shell: sqlite/sqlite3.o sqlite/shell.o sqlite/extensions.o lib/vercmp.o @@ -760,9 +763,10 @@ crypto/rfc3986.c: crypto/rfc3986.re rfc3986: rfc3986.c $(CC) -Wall -W -Wextra -Werror -o $@ $+ -zpm-fetchurl.o: CFLAGS+=-DTFM_DESC -Isrc/headers -Itomsfastmath/src/headers -DARGTYPE=4 -DLTC_NO_ASM -DTFM_NO_ASM -Ilibtomcrypt/src/headers -DLTC_SOURCE -Icrypto -Wno-pointer-sign -DDEBUG +src/fetchurl.o: CFLAGS+=-DTFM_DESC -Isrc/headers -Itomsfastmath/src/headers -DARGTYPE=4 -DLTC_NO_ASM -DTFM_NO_ASM -Ilibtomcrypt/src/headers -DLTC_SOURCE -Icrypto -Wno-pointer-sign -DDEBUG -zpm-fetchurl: ltc.o tls.o tfm.o zpm-fetchurl.o crypto/https.o crypto/rfc3986.o +zpm-fetchurl: ltc.o tls.o tfm.o src/fetchurl.o crypto/https.o crypto/rfc3986.o + $(CC) $(CFLAGS) -o $@ $+ testddg: zpm-fetchurl ./zpm-fetchurl duckduckgo.com 443 / diff --git a/zpm-add.c b/src/add.c similarity index 100% rename from zpm-add.c rename to src/add.c diff --git a/zpm-addfile.c b/src/addfile.c similarity index 100% rename from zpm-addfile.c rename to src/addfile.c diff --git a/zpm-extract.c b/src/extract.c similarity index 100% rename from zpm-extract.c rename to src/extract.c diff --git a/zpm-fetchurl.c b/src/fetchurl.c similarity index 100% rename from zpm-fetchurl.c rename to src/fetchurl.c diff --git a/zpm-findpkg.c b/src/findpkg.c similarity index 100% rename from zpm-findpkg.c rename to src/findpkg.c diff --git a/zpm-foreach-path.c b/src/foreach-path.c similarity index 100% rename from zpm-foreach-path.c rename to src/foreach-path.c diff --git a/zpm-hash.c b/src/hash.c similarity index 100% rename from zpm-hash.c rename to src/hash.c diff --git a/zpm-init.c b/src/init.c similarity index 100% rename from zpm-init.c rename to src/init.c diff --git a/zpm-note.c b/src/note.c similarity index 100% rename from zpm-note.c rename to src/note.c diff --git a/zpm-packagehash.c b/src/packagehash.c similarity index 100% rename from zpm-packagehash.c rename to src/packagehash.c diff --git a/zpm-parse.c b/src/parse.c similarity index 100% rename from zpm-parse.c rename to src/parse.c diff --git a/zpm-quote.c b/src/quote.c similarity index 100% rename from zpm-quote.c rename to src/quote.c diff --git a/zpm-script.c b/src/script.c similarity index 100% rename from zpm-script.c rename to src/script.c diff --git a/zpm-search.c b/src/search.c similarity index 100% rename from zpm-search.c rename to src/search.c diff --git a/zpm-stat.c b/src/stat.c similarity index 100% rename from zpm-stat.c rename to src/stat.c diff --git a/zpm-syncfs.c b/src/syncfs.c similarity index 100% rename from zpm-syncfs.c rename to src/syncfs.c diff --git a/zpm-vercmp.c b/src/vercmp.c similarity index 100% rename from zpm-vercmp.c rename to src/vercmp.c diff --git a/zpm-verify.c b/src/verify.c similarity index 100% rename from zpm-verify.c rename to src/verify.c -- 2.40.0