diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-03-02 10:27:51 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-03-02 10:27:51 +0000 |
| commit | 87a1081f7c759feb0887c6beeaa97e9f289dc91c (patch) | |
| tree | 2fb24dc927d280d4b27dc7e0b49ca0feb72f6c70 /applications | |
| parent | 83332e13ad243cc4a4c088c6c35e77c19191b2e2 (diff) | |
[1.5] Sync with trunk. Remove remainings bits of old Makefile based build system
Diffstat (limited to 'applications')
| -rw-r--r-- | applications/jpip/libopenjpip/comMakefile.mk | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/applications/jpip/libopenjpip/comMakefile.mk b/applications/jpip/libopenjpip/comMakefile.mk deleted file mode 100644 index da479f47..00000000 --- a/applications/jpip/libopenjpip/comMakefile.mk +++ /dev/null @@ -1,29 +0,0 @@ -ifdef jpipserver -CFLAGS = -O3 -Wall -m32 -DSERVER -LIBNAME = libopenjpip_server.a -else -J2KINCDIR = ../../../bin -CFLAGS = -O3 -Wall -I$(J2KINCDIR) -LIBNAME = libopenjpip_local.a -endif - -all: $(LIBNAME) - -ifdef jpipserver -$(LIBNAME): openjpip.o target_manager.o byte_manager.o box_manager.o boxheader_manager.o manfbox_manager.o \ - mhixbox_manager.o marker_manager.o codestream_manager.o faixbox_manager.o index_manager.o \ - msgqueue_manager.o metadata_manager.o placeholder_manager.o ihdrbox_manager.o imgreg_manager.o \ - cachemodel_manager.o j2kheader_manager.o jp2k_encoder.o query_parser.o channel_manager.o \ - session_manager.o jpip_parser.o sock_manager.o auxtrans_manager.o - ar r $@ $^ -else -$(LIBNAME): openjpip.o target_manager.o byte_manager.o box_manager.o boxheader_manager.o manfbox_manager.o \ - mhixbox_manager.o marker_manager.o codestream_manager.o faixbox_manager.o index_manager.o \ - msgqueue_manager.o metadata_manager.o placeholder_manager.o ihdrbox_manager.o imgreg_manager.o \ - cachemodel_manager.o j2kheader_manager.o jp2k_encoder.o query_parser.o channel_manager.o \ - session_manager.o jpip_parser.o jp2k_decoder.o imgsock_manager.o jpipstream_manager.o cache_manager.o \ - dec_clientmsg_handler.o sock_manager.o - ar r $@ $^ -endif -clean: - rm -f $(LIBNAME) *.o *~ |