diff options
| author | Eleni Maria Stea <elene.mst@gmail.com> | 2013-04-15 12:26:08 +0300 |
|---|---|---|
| committer | Eleni Maria Stea <elene.mst@gmail.com> | 2013-04-15 12:26:08 +0300 |
| commit | 1eb2a154bd2294c20b37ce67ab17e8a2e90f6ee1 (patch) | |
| tree | 16d9d011bc2a1703be14f829f74dd667ff155dfe | |
| parent | 2f53fbef0a790039991345d98602565b883b698a (diff) | |
new Makefiles
| -rw-r--r-- | clock/Makefile | 12 | ||||
| -rw-r--r-- | winnie/Makefile | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/clock/Makefile b/clock/Makefile index 05167ac..22579b7 100644 --- a/clock/Makefile +++ b/clock/Makefile @@ -1,7 +1,7 @@ -src = $(wildcard src/*.cc) $(wildcard src/fbdev/*.cc) $(wildcard src/sdl/*.cc) +src = $(wildcard src/*.cc) obj = $(src:.cc=.o) dep = $(obj:.o=.d) -bin = clock +lib_so = winnie_clock.so dbg = -g opt = -O0 @@ -18,10 +18,10 @@ endif CXX = g++ CXXFLAGS = -pedantic -Wall $(dbg) $(opt) $(inc) $(def) `freetype-config --cflags` -LDFLAGS = -L../libwinnie/ $(libs) `freetype-config --libs` -lrt -lwinnie +LDFLAGS = -L../libwinnie/ $(libs) `freetype-config --libs` -lrt -lwinnie -ldl -$(bin): $(obj) - $(CXX) -o $@ $(obj) $(LDFLAGS) -Wl,-rpath=../libwinnie +$(lib_so): $(obj) + $(CXX) -o $@ -shared $(obj) $(LDFLAGS) -Wl,-rpath=../libwinnie -include $(dep) @@ -30,5 +30,5 @@ $(bin): $(obj) .PHONY: clean clean: - rm -f $(obj) $(bin) $(dep) + rm -f $(obj) $(lib_so) $(dep) diff --git a/winnie/Makefile b/winnie/Makefile index 6065e37..406a0fe 100644 --- a/winnie/Makefile +++ b/winnie/Makefile @@ -17,8 +17,8 @@ else endif CXX = g++ -CXXFLAGS = -pedantic -Wall $(dbg) $(opt) $(inc) $(def) `freetype-config --cflags` -LDFLAGS = -L../libwinnie $(libs) `freetype-config --libs` -lrt -lwinnie +CXXFLAGS = -pedantic -Wall $(dbg) -fPIC -D_GNU_SOURCE $(opt) $(inc) $(def) `freetype-config --cflags` +LDFLAGS = -L../libwinnie $(libs) `freetype-config --libs` -lrt -lwinnie -ldl $(bin): $(obj) $(CXX) -o $@ $(obj) $(LDFLAGS) -Wl,-rpath=../libwinnie |